summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2002-10-31 04:35:22 +0000
committerJohn Terpstra <jht@samba.org>2002-10-31 04:35:22 +0000
commit77eda21dea97f9367f71679f663f5ccaf42fbd3a (patch)
tree98ca5be8fe07bb37a2658115ef901026e1cafdca
parentb6e8169ac9cb745eee780215a0242837ac61dff1 (diff)
downloadsamba-77eda21dea97f9367f71679f663f5ccaf42fbd3a.tar.gz
samba-77eda21dea97f9367f71679f663f5ccaf42fbd3a.tar.bz2
samba-77eda21dea97f9367f71679f663f5ccaf42fbd3a.zip
Added the remainder of Buchan Milne's patches.
(This used to be commit 7415c2446934902894253d08e4c7f8ec78073482)
-rw-r--r--packaging/Mandrake/makerpms-cvs.sh4
-rw-r--r--packaging/Mandrake/winbind.init2
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/Mandrake/makerpms-cvs.sh b/packaging/Mandrake/makerpms-cvs.sh
index 0faaf4d0ba..72c75b772b 100644
--- a/packaging/Mandrake/makerpms-cvs.sh
+++ b/packaging/Mandrake/makerpms-cvs.sh
@@ -5,8 +5,8 @@
[ $# -lt 1 ] && echo "Usage: $0 <Samba version>" && exit 1
-VERSION=$1cvs
-RELEASE=`date +%Y%m%d`
+VERSION=$1
+RELEASE=0.`date +%Y%m%d`
shift
# Replace PRELEASE and PVERSION with release number in all files ending with
diff --git a/packaging/Mandrake/winbind.init b/packaging/Mandrake/winbind.init
index 13ddb392d7..b7b452eb0b 100644
--- a/packaging/Mandrake/winbind.init
+++ b/packaging/Mandrake/winbind.init
@@ -83,7 +83,7 @@ case "$1" in
mdkstatus
;;
condrestart)
- [ -f /var/lock/subsys/winbind ] && restart || :
+ [ -f /var/lock/subsys/winbindd ] && restart || :
;;
*)
echo "Usage: $0 {start|stop|restart|status|condrestart}"