devel/jabberd jabberd, 1.4, 1.5 jabberd.spec, 1.7, 1.8 jabberd.sysconfig, 1.2, 1.3

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/devel/jabberd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16562

Modified Files:
	jabberd jabberd.spec jabberd.sysconfig 
Log Message:
* c2s isn't suid anymore
* added option to start as root if required



Index: jabberd
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jabberd	28 Mar 2005 17:35:56 -0000	1.4
+++ jabberd	30 Mar 2005 19:46:31 -0000	1.5
@@ -71,7 +71,15 @@
 		rm -f /var/lock/subsys/${prog}
 		rm -f ${pidPath}/${prog}.pid
 		args="-c ${confPath}/${prog}.xml"
-		daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+		if [ ${prog} == "c2s" -a ! -z "$C2S_AS_ROOT" ]; then
+			if [ $C2S_AS_ROOT == "yes" ]; then
+				daemon --user root "${progsPath}/${prog} ${args} & 2> /dev/null"
+			else
+				daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+			fi
+		else
+			daemon --user jabber "${progsPath}/${prog} ${args} & 2> /dev/null"
+		fi
 		retval=$?
 		echo
 		if [ ${retval} == 0 ]; then


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jabberd.spec	28 Mar 2005 17:35:03 -0000	1.7
+++ jabberd.spec	30 Mar 2005 19:46:31 -0000	1.8
@@ -109,6 +109,9 @@
 # we have our own start script
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/jabberd
 
+# we have our own start script
+%{__rm} $RPM_BUILD_ROOT%{sysconfdir}/jabberd.cfg*
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -159,11 +162,7 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README PROTOCOL TODO
-%attr(4755, root, root) %{_bindir}/c2s
-%{_bindir}/router
-%{_bindir}/resolver
-%{_bindir}/s2s
-%{_bindir}/sm
+%{_bindir}/*
 %attr(750, jabber, jabber) %dir %{sysconfdir}/
 %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*
 %{_datadir}/man/man8/*
@@ -186,6 +185,8 @@
 - combined some of the sed magic
 - added a jabberd file in sysconfig to control if all daemons
   should be started
+- don't suid c2s and add config option in sysconfig/jabberd
+  to start c2s as root if required to authenticate against pam/shadow
 
 * Tue Mar 08 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s6.4
 - made password more random (/dev/random)


Index: jabberd.sysconfig
===================================================================
RCS file: /cvs/extras/devel/jabberd/jabberd.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jabberd.sysconfig	28 Mar 2005 17:34:04 -0000	1.2
+++ jabberd.sysconfig	30 Mar 2005 19:46:31 -0000	1.3
@@ -13,3 +13,7 @@
 # * s2s (Server to Server)
 #
 START_DAEMONS="router resolver sm c2s s2s"
+
+# set C2S_AS_ROOT to "yes" to start c2s as root
+# this can be necessary if c2s needs to authenticate against pam/shadow
+C2S_AS_ROOT="no"