Attachment #220909 for bug #306593

Lines 20-23 Link Here

(-)/usr/local/portage/net-im/ejabberd/files/ejabberd-2.confd (+2 lines)
20	# default is non smp	20	# default is non smp
21	#HAVE_SMP=0	21	#HAVE_SMP=0
22		22
		23	PIDFILE="/var/run/jabber/ejabberd.pid"
		24
23		25

Lines 36-49 Link Here

(-)/usr/local/portage/net-im/ejabberd/files/ejabberd-2.initd (-2 / +13 lines)
36	cd /var/lib/ejabberd	36	cd /var/lib/ejabberd
37	start-stop-daemon --start --quiet --chuid jabber:jabber \	37	start-stop-daemon --start --quiet --chuid jabber:jabber \
38	--name $BEAMNAME \	38	--name $BEAMNAME \
39	--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT	39	--background \
		40	--pidfile "${PIDFILE}" \
		41	--make-pidfile \
		42	--exec /usr/sbin/ejabberd -- -noinput -smp $SMPOPT
40	eend $?	43	eend $?
41	}	44	}
42		45
43	stop() {	46	stop() {
44	ebegin "Stopping ejabberd"	47	ebegin "Stopping ejabberd"
45	/usr/sbin/ejabberdctl stop	48	/usr/sbin/ejabberdctl stop
46	eend $?	49	local RETVAL=$?
		50	if [ ${RETVAL} != 0 ]; then
		51	eend ${RETVAL}
		52	else
		53	while [ $? != 1 ]; do
		54	kill -0 `cat "${PIDFILE}"` 2> /dev/null
		55	done
		56	eend ${RETVAL}
		57	fi
47	}	58	}
48		59
49	reload() {	60	reload() {

Return to bug 306593

Lines 515-521 in_state_change(to, in, subscribed) Link Here

(-)ejabberd-2.0.5/src/mod_roster.erl (-2 / +2 lines)
515	in_state_change(to, in, unsubscribe) -> {to, none};	515	in_state_change(to, in, unsubscribe) -> {to, none};
516	in_state_change(to, in, unsubscribed) -> {none, in};	516	in_state_change(to, in, unsubscribed) -> {none, in};
517	in_state_change(from, none, subscribe) -> none;	517	in_state_change(from, none, subscribe) -> none;
518	in_state_change(from, none, subscribed) -> none;	518	in_state_change(from, none, subscribed) -> {both, none};
519	in_state_change(from, none, unsubscribe) -> {none, none};	519	in_state_change(from, none, unsubscribe) -> {none, none};
520	in_state_change(from, none, unsubscribed) -> none;	520	in_state_change(from, none, unsubscribed) -> none;
521	in_state_change(from, out, subscribe) -> none;	521	in_state_change(from, out, subscribe) -> none;
Lines 544-550 out_state_change(none, both, subscribed) Link Here
544	out_state_change(none, both, unsubscribe) -> {none, in};	544	out_state_change(none, both, unsubscribe) -> {none, in};
545	out_state_change(none, both, unsubscribed) -> {none, out};	545	out_state_change(none, both, unsubscribed) -> {none, out};
546	out_state_change(to, none, subscribe) -> none;	546	out_state_change(to, none, subscribe) -> none;
547	out_state_change(to, none, subscribed) -> none;	547	out_state_change(to, none, subscribed) -> {both, none};
548	out_state_change(to, none, unsubscribe) -> {none, none};	548	out_state_change(to, none, unsubscribe) -> {none, none};
549	out_state_change(to, none, unsubscribed) -> none;	549	out_state_change(to, none, unsubscribed) -> none;
550	out_state_change(to, in, subscribe) -> none;	550	out_state_change(to, in, subscribe) -> none;