From 4456d5edd9207674d03bf503e8b245e5dc1ca8d8 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 25 Sep 2002 15:29:42 +0000
Subject: [PATCH] sync'ing up for 3.0alpha20 release

---
 packaging/Caldera/OpenLinux/samba3.spec.tmpl    | 19 +++++++++----------
 packaging/SGI/winbindd.rc                       |  6 +++---
 testsuite/build_farm/basicsmb-sharelist.test    |  5 ++++-
 testsuite/build_farm/basicsmb.smb.conf.template |  4 +++-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 701dd350734..43e60a2ac09 100644
--- a/packaging/Caldera/OpenLinux/samba3.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
@@ -244,25 +244,23 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--with-netatalk \
 	--with-smbwrapper \
 	--with-libsmbclient \
+	--with-acl-support \
 	--with-sambabook=$(DESTDIR)/usr/share/swat/using_samba
 
 # Temp disabled - add later - JHT
 #	--with-pam_smbpass \
 #	--with-nisplus-home \
-#	--with-acl-support \
 
 make all nsswitch/libnss_wins.so nsswitch/libnss_winbind.so torture nsswitch/pam_winbind.so everything
 (cd tdb; make tdbdump tdbtest tdbtorture tdbtool)
 
-#cd ../examples/VFS
+cd ../examples/VFS
 #CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 #        --prefix='$(DESTDIR)/usr' \
 #        --localstatedir='$(DESTDIR)/var' \
 #        --libdir='$(DESTDIR)%{EtcSamba}' \
 #        --sbindir='$(DESTDIR)/usr/sbin'
-#make
-#cd block
-#make
+make
 
 %Install
 %{mkDESTDIR}
@@ -296,7 +294,7 @@ do
 	install -m 755 source/bin/$i $DESTDIR/usr/bin
 done
 # Next install /usr/sbin progs
-for i in talloctort samsync locktest locktest2 masktest msgtest smbtorture
+for i in talloctort locktest locktest2 masktest msgtest smbtorture
 do
 	install -m 755 source/bin/$i $DESTDIR/usr/sbin
 done
@@ -304,11 +302,12 @@ for i in tdbdump tdbtest tdbtorture tdbtool
 do
 	install -m 755 source/tdb/$i $DESTDIR/usr/sbin
 done
+
 # Add VFS Modules
-#for i in audit.so recycle.so block/block.so
-#do
-#	install -m755 $i $DESTDIR/lib/samba
-#done
+for i in audit.so recycle.so netatalk.so skel.so
+do
+	install -m755 examples/VFS/$i $DESTDIR/lib/samba
+done
 
 #mv $DESTDIR/usr/bin/{make,add,conv}* $DESTDIR/usr/sbin
 
diff --git a/packaging/SGI/winbindd.rc b/packaging/SGI/winbindd.rc
index c63944a04d9..deb4708c667 100644
--- a/packaging/SGI/winbindd.rc
+++ b/packaging/SGI/winbindd.rc
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 #
-# winbindd server control
+# winbindd control
 #
 
 IS_ON=/etc/chkconfig
@@ -21,7 +21,7 @@ fi
 
 case $1 in
 'start')
-	if $IS_ON winbindd && test -x $WINBINDD; then
+	if $IS_ON winbind && test -x $WINBINDD; then
 	    $KILLALL -15 winbindd
 	    $ECHO "winbindd:\c"
 	    $WINBINDD ; $ECHO " winbindd."
@@ -33,6 +33,6 @@ case $1 in
 	exit 0
 	;;
 *)
-	echo "usage: /etc/init.d/winbindd {start|stop}"
+	echo "usage: /etc/init.d/winbind {start|stop}"
 	;;
 esac
diff --git a/testsuite/build_farm/basicsmb-sharelist.test b/testsuite/build_farm/basicsmb-sharelist.test
index 87c3e475525..188e985658d 100644
--- a/testsuite/build_farm/basicsmb-sharelist.test
+++ b/testsuite/build_farm/basicsmb-sharelist.test
@@ -12,7 +12,10 @@ test_sharelist() {
 	return 0
 }
 
-(test_smb_conf_setup) || exit 1
+# Need guest account
+password=samba
+security=USER
+(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
 
 test_sharelist || exit 1
 
diff --git a/testsuite/build_farm/basicsmb.smb.conf.template b/testsuite/build_farm/basicsmb.smb.conf.template
index 64cdbaa5e56..9b8483db162 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.template
+++ b/testsuite/build_farm/basicsmb.smb.conf.template
@@ -15,11 +15,13 @@
 
     add machine script = useradd %u -d /dev/null -s /bin/false
 
-    panic action = echo bt | gdb PREFIX/sbin/smbd %d
+    panic action = /bin/sh BUILD_FARM/samba/testsuite/build_farm/backtrace %d
 
     passdb backend = smbpasswd_nua
 
     non unix account range = 10000-200000
+    map hidden = yes
+    create mask = 0777
 
 [test]
     path = PREFIX/testdir
-- 
2.11.4.GIT