rpms/cyrus-sasl/devel cyrus-sasl.spec, 1.84, 1.85 saslauthd.init, 1.6, 1.7

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5337

Modified Files:
	cyrus-sasl.spec saslauthd.init 
Log Message:
Repair initscript to make condrestart working properly



Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- cyrus-sasl.spec	24 Sep 2009 10:14:56 -0000	1.84
+++ cyrus-sasl.spec	24 Sep 2009 11:32:04 -0000	1.85
@@ -8,7 +8,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -387,7 +387,7 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
-* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-4
+* Thu Sep 24 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-5
 - Repair initscript to make condrestart working properly (#522103)
 
 * Wed Sep 23 2009 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-3


Index: saslauthd.init
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/saslauthd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- saslauthd.init	23 Sep 2009 16:01:58 -0000	1.6
+++ saslauthd.init	24 Sep 2009 11:32:04 -0000	1.7
@@ -38,7 +38,7 @@ lockfile=/var/lock/subsys/$prog
 start() {
 	[ -x $path ] || exit 5
 	echo -n $"Starting $prog: "
-	daemon $DAEMONOPTS $path -m $SOCKETDIR -a $MECH $FLAGS
+	daemon $path -m $SOCKETDIR -a $MECH $FLAGS
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch $lockfile
@@ -98,7 +98,12 @@ case "$1" in
   status)
 	rh_status
 	;;
-  condrestart|try-restart)
+  condrestart)
+	if [ -f /var/lock/subsys/$prog ]; then
+	    restart
+	fi
+	;;
+  try-restart)
 	rh_status_q || exit 0
 	restart
 	;;