summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/Caldera/OpenLinux/samba3.spec.tmpl19
-rw-r--r--packaging/SGI/winbindd.rc6
-rw-r--r--testsuite/build_farm/basicsmb-sharelist.test5
-rw-r--r--testsuite/build_farm/basicsmb.smb.conf.template4
4 files changed, 19 insertions, 15 deletions
diff --git a/packaging/Caldera/OpenLinux/samba3.spec.tmpl b/packaging/Caldera/OpenLinux/samba3.spec.tmpl
index 701dd35073..43e60a2ac0 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 c63944a04d..deb4708c66 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 87c3e47552..188e985658 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 64cdbaa5e5..9b8483db16 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