rpms/samba/devel nmb.init, 1.1, 1.2 smb.init, 1.7, 1.8 winbind.init, 1.4, 1.5

[Simo Sorce (simo)]

Author: simo

Update of /cvs/pkgs/rpms/samba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18249

Modified Files:
	nmb.init smb.init winbind.init 
Log Message:

Fix 244823




Index: nmb.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/nmb.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nmb.init	26 Mar 2007 16:30:02 -0000	1.1
+++ nmb.init	25 Jun 2007 13:51:51 -0000	1.2
@@ -14,7 +14,7 @@
 elif [ -f /etc/rc.d/init.d/functions ] ; then
   . /etc/rc.d/init.d/functions
 else
-  exit 0
+  exit 1
 fi
 
 # Avoid using root's TMPDIR
@@ -28,10 +28,10 @@
 fi
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f /etc/samba/smb.conf ] || exit 6
 
 RETVAL=0
 
@@ -72,9 +72,7 @@
 
 rhstatus() {
 	status nmbd
-	if [ $? -ne 0 ] ; then
-		return 1
-	fi
+	return $?
 }	
 
 
@@ -85,7 +83,7 @@
 fi
 
 # Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 0
+[ -w /etc/samba/smb.conf ] || exit 4
 
 
 
@@ -110,7 +108,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


Index: smb.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/smb.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- smb.init	26 Mar 2007 16:30:02 -0000	1.7
+++ smb.init	25 Jun 2007 13:51:51 -0000	1.8
@@ -14,7 +14,7 @@
 elif [ -f /etc/rc.d/init.d/functions ] ; then
   . /etc/rc.d/init.d/functions
 else
-  exit 0
+  exit 1
 fi
 
 # Avoid using root's TMPDIR
@@ -28,10 +28,10 @@
 fi
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f /etc/samba/smb.conf ] || exit 6
 
 RETVAL=0
 
@@ -72,9 +72,7 @@
 
 rhstatus() {
 	status smbd
-	if [ $? -ne 0 ] ; then
-		return 1
-	fi
+	return $?
 }	
 
 
@@ -85,7 +83,7 @@
 fi
 
 # Check that we can write to it... so non-root users stop here
-[ -w /etc/samba/smb.conf ] || exit 0
+[ -w /etc/samba/smb.conf ] || exit 4
 
 
 
@@ -110,7 +108,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


Index: winbind.init
===================================================================
RCS file: /cvs/pkgs/rpms/samba/devel/winbind.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- winbind.init	19 Apr 2007 14:28:00 -0000	1.4
+++ winbind.init	25 Jun 2007 13:51:51 -0000	1.5
@@ -17,10 +17,10 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ ${NETWORKING} = "no" ] && exit 1
 
 # Check that smb.conf exists.
-[ -f /etc/samba/smb.conf ] || exit 0
+[ -f /etc/samba/smb.conf ] || exit 6
 
 [ -f /etc/sysconfig/samba ] && . /etc/sysconfig/samba
 
@@ -63,8 +63,18 @@
 
 rhstatus() {
 	status winbindd
+	return $?
 }	
 
+# Allow status as non-root.
+if [ "$1" = status ]; then
+       rhstatus
+       exit $?
+fi
+
+# Check that we can write to it... so non-root users stop here
+[ -w /etc/samba/smb.conf ] || exit 4
+
 case "$1" in
   start)
   	start
@@ -86,7 +96,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?