Start of merge to 2_2_RELEASE branch for release.

Jeremy.
author: Jeremy Allison <jra@samba.org> 2002-04-30 13:28:41 +0000
committer: Jeremy Allison <jra@samba.org> 2002-04-30 13:28:41 +0000
commit: d04b55f2186fb8af998cf61c576771a5f72f4892 (patch)
tree: 9ff8c3a7cf34cefc0ee9a550a3bb1236a9e77595 /packaging/Caldera
parent: 73267ca42d9eddabb71b31b4c5068ebbe7bc9f7c (diff)
download: samba-d04b55f2186fb8af998cf61c576771a5f72f4892.tar.gz
samba-d04b55f2186fb8af998cf61c576771a5f72f4892.tar.xz
samba-d04b55f2186fb8af998cf61c576771a5f72f4892.zip
30 files changed, 592 insertions, 625 deletions
diff --git a/packaging/Caldera/OpenLinux/samba.init-lsb b/packaging/Caldera/OpenLinux/samba.init-lsb
index 615e17b21fc..80913c3340e 100755
--- a/packaging/Caldera/OpenLinux/samba.init-lsb
+++ b/packaging/Caldera/OpenLinux/samba.init-lsb
@@ -40,7 +40,6 @@ status() {
   return 0               # seems to be up and running
 }
 
-# this function is dedicated to Jan Terpstra. -- Klaus Singvogel, Sep. 2001.
 WinbdConfig() {
   # returns 0 if winbindd is not configured,
   # and     1 if winbindd is configured.
@@ -77,7 +76,7 @@ case "$1" in
 
   echo -n "Starting $SVIsubsys services: "
   ssd -S -n $NAME_S -x $DAEMON_S -- $OPTIONS_SMB
-  WinbdConfig $config_file || ssd -S -n $NAME_W -x $DAEMON_W -- $OPTIONS_WINBD
+  WinbdConfig $config_file || SVIstatus winbindd || ssd -S -n $NAME_W -x $DAEMON_W -- $OPTIONS_WINBD
   ssd -S -n $NAME_N -x $DAEMON_N -- $OPTIONS_NMB
   ret=$?
 
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
index 737f91aefcd..df0b6bff4d2 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
@@ -274,6 +274,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--libdir='$(DESTDIR)%{EtcSamba}' \
 	--with-privatedir='$(LIBDIR)' \
 	--with-lockdir='$(DESTDIR)/var/lock/samba.d' \
+	--with-piddir='$(DESTDIR)/var/run/samba' \
 	--with-swatdir='$(DESTDIR)/usr/share/swat' \
 	--with-sambabook='$(DESTDIR)/usr/share/swat/using_samba' \
 	--with-configdir='$(DESTDIR)'%{EtcSamba} \
@@ -291,6 +292,14 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 #	--with-tdbsam
 
 make LOGFILEBASE=/var/log/samba.d all nsswitch/libnss_wins.so debug2html bin/smbspool
+
+# Now build the VFS modules
+cd ../examples/VFS
+make
+cd block
+mv block.c block.c.old
+sed 's/etc\/samba/etc\/samba\.d/g' < block.c.old > block.c
+make
  
 
 %Install
@@ -298,14 +307,14 @@ make LOGFILEBASE=/var/log/samba.d all nsswitch/libnss_wins.so debug2html bin/smb
 VVS=packaging/%{Vendor}/%{Dist}
 
 mkdir -p $DESTDIR/etc/{{logrotate,pam}.d,sysconfig/daemons}
-mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba}
+mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba,run/samba}
 mkdir -p $DESTDIR/usr/share/swat/using_samba/{gifs,figs}
 mkdir -p $DESTDIR/lib/security
 mkdir -p $DESTDIR/%{LSBservedir}/{netlogon,profiles,Public}
 mkdir -p $DESTDIR/etc/skel/Samba
 mkdir -p $DESTDIR/usr/share/samba/codepages/src $DESTDIR/sbin
 mkdir -p $DESTDIR/%{SVIdir}
-mkdir -p $DESTDIR/usr/{include,lib}
+mkdir -p $DESTDIR/usr/{include,lib/samba}
 
 make LOGFILEBASE=/var/log/samba.d -C source  install
 
@@ -328,6 +337,12 @@ install -m 755 source/nsswitch/libnss_winbind.so $DESTDIR/lib/libnss_winbind.so.
 ln -s libnss_winbind.so.2.0 $DESTDIR/lib/libnss_winbind.so.2
 ln -s libnss_winbind.so.2.0 $DESTDIR/lib/libnss_winbind.so
 
+# Adding VFS modules
+install -m 755 examples/VFS/audit.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/recycle.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/skel.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/block/block.so $DESTDIR/usr/lib/samba
+
 install -m 755 source/nsswitch/pam_winbind.so $DESTDIR/lib/security
 install -m 755 source/bin/wbinfo $DESTDIR/usr/bin
 install -m 755 source/bin/debug2html $DESTDIR/usr/sbin/debug2html
@@ -350,6 +365,7 @@ cp -p $VVS/smbadduser $DESTDIR/usr/bin/smbadduser
 
 cp -p $VVS/findsmb $DESTDIR/usr/bin
 cp -p $VVS/samba.daemon $DESTDIR/etc/sysconfig/daemons/samba
+cp -p $VVS/winbind.daemon $DESTDIR/etc/sysconfig/daemons/winbind
 cp -p $VVS/samba.pam $DESTDIR/etc/pam.d/samba
 cp -p $VVS/samba.logrotate $DESTDIR/etc/logrotate.d/samba
 cp -p $VVS/README.home $DESTDIR/etc/skel/Samba/README.txt
@@ -358,7 +374,8 @@ cp -p $VVS/README.profiles $DESTDIR/%{LSBservedir}/profiles/README.txt
 
 
 #lsb: cp -p $VVS/samba.init $DESTDIR/etc/rc.d/init.d/samba
-install -m 755 $VVS/samba.init-lsb $DESTDIR/%{SVIdir}/%{Name}
+install -m 755 $VVS/samba.init-lsb $DESTDIR/%{SVIdir}/samba
+install -m 755 $VVS/winbind.init $DESTDIR/%{SVIdir}/winbind
 ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
 
 for f in testparm testprns; do
@@ -431,6 +448,7 @@ done
 cat << 'EOF' | %{mkLists} -d samba
 Samba					base
 /lib/$					base
+/usr/lib/samba/$				base
 %{LSBservedir}				config-IGNORED
 ^/(etc|var|home|tmp)			config-IGNORED
 swat					swat
@@ -449,6 +467,8 @@ Samba/README.txt			base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 libnss_*				base
 pam_*					base
+winbind*				base
+/usr/lib/samba/*			base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 %{_defaultdocdir}/samba- 		doc
 smb(mount|mnt|umount)			smbfs
@@ -500,13 +520,16 @@ test "$1" = "0" || exit 0
 %Files -f files-samba-base
 %defattr(-,root,root)
 %config %attr(0755,root,root) %{SVIdir}/samba
+%config %attr(0755,root,root) %{SVIdir}/winbind
 %config %attr(644,root,root) /etc/sysconfig/daemons/samba
+%config %attr(644,root,root) /etc/sysconfig/daemons/winbind
 %config %attr(644,root,root) /etc/pam.d/samba
 %config %attr(644,root,root) /etc/logrotate.d/samba
 %config %attr(-,root,root) %{EtcSamba}
 %dir %attr(755,root,root) /var/lock/samba.d
 %dir %attr(755,root,root) /var/log/samba.d
 %dir %attr(1777,root,root) /var/spool/samba
+%dir %attr(755,root,root) /var/run/samba
 %dir %attr(755,root,root) %{LSBservedir}
 %dir %attr(755,root,root) %{LSBservedir}/netlogon
 %dir %attr(755,root,root) %{LSBservedir}/profiles
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl
index 756633e9310..a46d4cac062 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl
@@ -270,6 +270,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--libdir='$(DESTDIR)%{EtcSamba}' \
 	--with-privatedir='$(LIBDIR)' \
 	--with-lockdir='$(DESTDIR)/var/lock/samba.d' \
+	--with-piddir='$(DESTDIR)/var/run/samba' \
 	--with-swatdir='$(DESTDIR)/usr/share/swat' \
 	--with-sambabook='$(DESTDIR)/usr/share/swat/using_samba' \
 	--with-configdir='$(DESTDIR)'%{EtcSamba} \
@@ -290,13 +291,22 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 
 make LOGFILEBASE=/var/log/samba.d everything nsswitch/libnss_wins.so
 
+# Now build the VFS modules
+cd ../examples/VFS
+make
+cd block
+mv block.c block.c.old
+sed 's/etc\/samba/etc\/samba\.d/g' < block.c.old > block.c
+make
+
+
 
 %Install
 %{mkDESTDIR}
 VVS=packaging/%{Vendor}/%{Dist}
 
 mkdir -p $DESTDIR/etc/{{logrotate,pam}.d,sysconfig/daemons}
-mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba}
+mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba,run/samba}
 mkdir -p $DESTDIR/usr/share/swat/using_samba/{gifs,figs}
 mkdir -p $DESTDIR/lib/security
 mkdir -p $DESTDIR/%{LSBservedir}/{netlogon,profiles,Public}
@@ -342,12 +352,19 @@ install -m 755 source/bin/smbsh $DESTDIR/usr/bin
 install -m 755 source/bin/smbwrapper.so $DESTDIR/usr/bin
 install -m 755 source/bin/smbtorture $DESTDIR/usr/sbin
 
+# Adding VFS modules
+install -m 755 examples/VFS/audit.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/recycle.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/skel.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/block/block.so $DESTDIR/usr/lib/samba
+
 cp -p $VVS/smb.conf.sample $DESTDIR%{EtcSamba}/smb.conf.sample
 cp -p $VVS/smb.conf $DESTDIR%{EtcSamba}/smb.conf
 cp -p $VVS/smbusers $DESTDIR%{EtcSamba}
 cp -p $VVS/smbprint $DESTDIR/usr/bin
 cp -p $VVS/findsmb $DESTDIR/usr/bin
 cp -p $VVS/samba.daemon $DESTDIR/etc/sysconfig/daemons/samba
+cp -p $VVS/winbind.daemon $DESTDIR/etc/sysconfig/daemons/winbind
 cp -p $VVS/samba.pam $DESTDIR/etc/pam.d/samba
 cp -p $VVS/samba.logrotate $DESTDIR/etc/logrotate.d/samba
 cp -p $VVS/README.home $DESTDIR/etc/skel/Samba/README.txt
@@ -357,6 +374,7 @@ cp -p $VVS/README.profiles $DESTDIR/%{LSBservedir}/profiles/README.txt
 
 install -m 755 $VVS/samba.init-lsb $DESTDIR/%{SVIdir}/%{Name}
 #lsb: cp -p $VVS/samba.init $DESTDIR/etc/rc.d/init.d/samba
+#lsb: cp -p $VVS/winbind.init $DESTDIR/etc/rc.d/init.d/winbind
 ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
 
 
@@ -423,6 +441,7 @@ done
 cat << 'EOF' | %{mkLists} -d samba
 Samba					base
 /lib/$					base
+/usr/lib/samba/$			base
 %{LSBservedir}				config-IGNORED
 ^/(etc|var|home|tmp)			config-IGNORED
 swat					swat
@@ -441,6 +460,8 @@ Samba/README.txt			base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 libnss_*				base
 pam_*					base
+winbind*				base
+/usr/lib/samba/$			base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 %{_defaultdocdir}/samba- 		doc
 smb(mount|mnt|umount)			smbfs
@@ -486,7 +507,9 @@ test "$1" = "0" || exit 0
 %Files -f files-samba-base
 %defattr(-,root,root)
 %config %attr(0755,root,root) %{SVIdir}/samba
+%config %attr(0755,root,root) %{SVIdir}/winbind
 %config %attr(644,root,root) /etc/sysconfig/daemons/samba
+%config %attr(644,root,root) /etc/sysconfig/daemons/winbind
 %config %attr(644,root,root) /etc/pam.d/samba
 %config %attr(644,root,root) /etc/logrotate.d/samba
 %config %attr(-,root,root) %{EtcSamba}
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl
index ef9564ceef2..b4842fc3f79 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl
@@ -192,9 +192,6 @@ a clean and stable API for SMB client application development.
 
 %Prep
 %setup
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
 
 # instead of patch (to help configuration) ...   ;^)
 %{fixUP} -vbT source/Makefile.in -e '
@@ -271,6 +268,7 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--libdir='$(DESTDIR)%{EtcSamba}' \
 	--with-privatedir='$(LIBDIR)' \
 	--with-lockdir='$(DESTDIR)/var/lock/samba.d' \
+	--with-piddir='$(DESTDIR)/var/run/samba' \
 	--with-swatdir='$(DESTDIR)/usr/share/swat' \
 	--with-sambabook='$(DESTDIR)/usr/share/swat/using_samba' \
 	--with-configdir='$(DESTDIR)'%{EtcSamba} \
@@ -290,20 +288,28 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 
 make LOGFILEBASE=/var/log/samba.d everything nsswitch/libnss_wins.so
 
+# Now build the VFS modules
+cd ../examples/VFS
+make
+cd block
+mv block.c block.c.old
+sed 's/etc\/samba/etc\/samba\.d/g' < block.c.old > block.c
+make
+
 
 %Install
 %{mkDESTDIR}
 VVS=packaging/%{Vendor}/%{Dist}
 
 mkdir -p $DESTDIR/etc/{{logrotate,pam}.d,sysconfig/daemons}
-mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba}
+mkdir -p $DESTDIR/var/{lo{ck,g}/samba.d,spool/samba,run/samba}
 mkdir -p $DESTDIR/usr/share/swat/using_samba/{gifs,figs}
 mkdir -p $DESTDIR/lib/security
 mkdir -p $DESTDIR/%{LSBservedir}/{netlogon,profiles,Public}
 mkdir -p $DESTDIR/etc/skel/Samba
 mkdir -p $DESTDIR/usr/share/samba/codepages/src $DESTDIR/sbin
 mkdir -p $DESTDIR/%{SVIdir}
-mkdir -p $DESTDIR/usr/{include,lib}
+mkdir -p $DESTDIR/usr/{include,lib/samba}
 
 make LOGFILEBASE=/var/log/samba.d -C source install
 
@@ -343,12 +349,19 @@ install -m 755 source/bin/smbwrapper.so $DESTDIR/usr/bin
 install -m 755 source/bin/smbtorture $DESTDIR/usr/sbin
 install -m 755 $VVS/smbadduser $DESTDIR/usr/bin
 
+# Adding VFS modules
+install -m 755 examples/VFS/audit.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/recycle.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/skel.so $DESTDIR/usr/lib/samba
+install -m 755 examples/VFS/block/block.so $DESTDIR/usr/lib/samba
+
 cp -p $VVS/smb.conf.sample $DESTDIR%{EtcSamba}/smb.conf.sample
 cp -p $VVS/smb.conf $DESTDIR%{EtcSamba}/smb.conf
 cp -p $VVS/smbusers $DESTDIR%{EtcSamba}
 cp -p $VVS/smbprint $DESTDIR/usr/bin
 cp -p $VVS/findsmb $DESTDIR/usr/bin
 cp -p $VVS/samba.daemon $DESTDIR/etc/sysconfig/daemons/samba
+cp -p $VVS/winbind.daemon $DESTDIR/etc/sysconfig/daemons/winbind
 cp -p $VVS/samba.pam $DESTDIR/etc/pam.d/samba
 cp -p $VVS/samba.logrotate $DESTDIR/etc/logrotate.d/samba
 cp -p $VVS/README.home $DESTDIR/etc/skel/Samba/README.txt
@@ -357,6 +370,7 @@ cp -p $VVS/README.profiles $DESTDIR/%{LSBservedir}/profiles/README.txt
 
 
 install -m 755 $VVS/samba.init-lsb $DESTDIR/%{SVIdir}/%{Name}
+install -m 755 $VVS/winbind.init $DESTDIR/%{SVIdir}/winbind
 #lsb: cp -p $VVS/samba.init $DESTDIR/etc/rc.d/init.d/samba
 ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
 
@@ -424,6 +438,7 @@ done
 cat << 'EOF' | %{mkLists} -d samba
 Samba					base
 /lib/$					base
+/usr/lib/samba/$			base
 %{LSBservedir}				config-IGNORED
 ^/(etc|var|home|tmp)			config-IGNORED
 swat					swat
@@ -442,6 +457,8 @@ Samba/README.txt			base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 libnss_*				base
 pam_*					base
+winbind*				base
+/usr/lib/samba/*			base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 %{_defaultdocdir}/samba- 		doc
 smb(mount|mnt|umount)			smbfs
@@ -487,13 +504,16 @@ test "$1" = "0" || exit 0
 %Files -f files-samba-base
 %defattr(-,root,root)
 %config %attr(0755,root,root) %{SVIdir}/samba
+%config %attr(0755,root,root) %{SVIdir}/winbind
 %config %attr(644,root,root) /etc/sysconfig/daemons/samba
+%config %attr(644,root,root) /etc/sysconfig/daemons/winbind
 %config %attr(644,root,root) /etc/pam.d/samba
 %config %attr(644,root,root) /etc/logrotate.d/samba
 %config %attr(-,root,root) %{EtcSamba}
 %dir %attr(755,root,root) /var/lock/samba.d
 %dir %attr(755,root,root) /var/log/samba.d
 %dir %attr(1777,root,root) /var/spool/samba
+%dir %attr(755,root,root) /var/run/samba
 %dir %attr(755,root,root) %{LSBservedir}
 %dir %attr(755,root,root) %{LSBservedir}/netlogon
 %dir %attr(755,root,root) %{LSBservedir}/profiles
diff --git a/packaging/Caldera/OpenServer/Compile b/packaging/Caldera/OpenServer/Compile
index cba414ec743..7628704f0d3 100755
--- a/packaging/Caldera/OpenServer/Compile
+++ b/packaging/Caldera/OpenServer/Compile
@@ -12,7 +12,7 @@ CFLAGS="-O3 -I/usr/local/include -L/usr/local/lib"
 CXX="g++"
 CXXFLAGS="-O3 -I/usr/local/include/stl -I/usr/local/include -L/usr/local/lib"
 RANLIB=true
-MAKE=/usr/local/bin/make
+MAKE=/usr/gnu/bin/make
 if [ "$V" = "echo" ]
 then
     echo "exporting the following shell variables:"
@@ -31,18 +31,18 @@ then
     echo "cd ../../../source"
     echo "rm -f mout-1 mout-2 mout-3 mout-4"
     echo "make all 2>&1 | tee mout-1"
-    echo "make smbfilter smbtorture debug2html 2>&1 | tee mout-2"
-    echo "make bin/smbspool smbwrapper bin/wbinfo 2>&1 | tee mout-3"
-    echo "make masktest locktest locktest2 2>&1 | tee mout-3"
+    echo "make smbfilter debug2html 2>&1 | tee mout-2"
+    echo "make bin/smbspool bin/wbinfo 2>&1 | tee mout-3"
 else
     cd ../../../source
     rm -f mout-1 mout-2 mout-3 mout-4
     make all 2>&1 | tee mout-1
-    make smbfilter smbtorture debug2html 2>&1 | tee mout-2
-    make bin/smbspool smbwrapper bin/wbinfo 2>&1 | tee mout-3
-    make masktest locktest locktest2 2>&1 | tee mout-3
+    make smbfilter debug2html 2>&1 | tee mout-2
+    make bin/smbspool bin/wbinfo 2>&1 | tee mout-3
 fi
 #
 # Not building :
 #     nsswitch - no <nss.h>
 #     rpctorture - improper use of client_info struct, dunno
+#     smbtorture, locktest, locktest2, masktest - used for dev. only
+#     smbwrapper, smbsh - untested and unlikely to work on osr5
diff --git a/packaging/Caldera/OpenServer/Configure b/packaging/Caldera/OpenServer/Configure
index 11826339d73..9e303c1dd2e 100755
--- a/packaging/Caldera/OpenServer/Configure
+++ b/packaging/Caldera/OpenServer/Configure
@@ -17,6 +17,7 @@ PREFIX=/usr/lib/samba
 LIBDIR=/etc/samba.d
 PRIVATEDIR=/etc/samba.d
 LOCKDIR=/var/locks/samba.d
+LOGDIR=/var/log/samba.d
 if [ "$V" = "echo" ]
 then
     echo "exporting the following shell variables:"
@@ -46,7 +47,8 @@ then
 	--prefix=${PREFIX} \
 	--libdir=${LIBDIR} \
 	--with-privatedir=${PRIVATEDIR} \
-        --with-lockdir={$LOCKDIR} \
+        --with-lockdir=${LOCKDIR} \
+        --with-logfilebase=${LOGDIR} \
 	--with-profile \
 	--with-syslog \
 	--with-utmp \
@@ -59,7 +61,8 @@ else
 	--prefix=${PREFIX} \
 	--libdir=${LIBDIR} \
 	--with-privatedir=${PRIVATEDIR} \
-        --with-lockdir={$LOCKDIR} \
+        --with-lockdir=${LOCKDIR} \
+        --with-logfilebase=${LOGDIR} \
 	--with-profile \
 	--with-syslog \
 	--with-utmp \
diff --git a/packaging/Caldera/OpenServer/Install b/packaging/Caldera/OpenServer/Install
index 0df78034c7b..8fc79bcac5c 100755
--- a/packaging/Caldera/OpenServer/Install
+++ b/packaging/Caldera/OpenServer/Install
@@ -20,6 +20,7 @@ BUILD_ROOT=${HERE}/dist
 BLDFIX=${BUILD_ROOT}/${PREFIX}
 $V rm -rf $BUILD_ROOT
 $V mkdir -p $BUILD_ROOT/etc/init.d
+$V mkdir -p $BUILD_ROOT/etc/samba.d
 $V mkdir -p $BUILD_ROOT/usr/lib/mkdev
 $V mkdir -p $BUILD_ROOT/doc
 $V mkdir -p ${BLDFIX}/bin
@@ -51,8 +52,7 @@ cd ../../..
 
 # Install standard binary files
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool \
-      smbsh
+      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool
 do
 $V    install -m755 -s source/bin/$i ${BLDFIX}/bin
 done
@@ -62,7 +62,7 @@ $V    install -m755 source/script/$i ${BLDFIX}/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat debug2html smbtorture smbfilter locktest2 masktest
+for i in smbd nmbd swat debug2html smbfilter
 do
 $V    install -m755 -s source/bin/$i ${BLDFIX}/sbin
 done
@@ -126,6 +126,7 @@ $V install -m644 docs/manpages/smbmnt.8 ${BLDFIX}/man/man.8
 $V install -m644 docs/manpages/smbumount.8 ${BLDFIX}/man/man.8
 $V install -m644 ${PKGDIR}/smb.conf $BUILD_ROOT/etc/samba.d/smb.conf.default
 $V install -m644 ${PKGDIR}/smbusers $BUILD_ROOT/etc/samba.d/smbusers
+$V install -m644 ${PKGDIR}/lmhosts $BUILD_ROOT/etc/samba.d/lmhosts
 $V install -m755 ${PKGDIR}/smbprint ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/findsmb ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/smbadduser ${BLDFIX}/bin
@@ -133,6 +134,9 @@ $V install -m755 ${PKGDIR}/initconfig ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/smb.init $BUILD_ROOT/etc/init.d/samba
 $V install -m755 ${PKGDIR}/smb.mkdev $BUILD_ROOT/usr/lib/mkdev/samba
 $V install -m644 ${PKGDIR}/docview.html $BUILD_ROOT/doc/index.html
+$V install -m644 ${PKGDIR}/osr5config.html $BUILD_ROOT/doc
+$V install -m644 ${PKGDIR}/callogo.gif $BUILD_ROOT/doc
+$V install -m644 ${PKGDIR}/samba.desktop $BUILD_ROOT/doc
 $V install -m644 ${PKGDIR}/swat.readme ${BLDFIX}/swat/README
 
 # The following is now done in the postinstall script
diff --git a/packaging/Caldera/OpenServer/README b/packaging/Caldera/OpenServer/README
index 6e8915161c1..678e45a90cf 100644
--- a/packaging/Caldera/OpenServer/README
+++ b/packaging/Caldera/OpenServer/README
@@ -1,26 +1,11 @@
-Preparation Date: April 13, 2001
-Preparer:	  Ronald Joe Record <rr@sco.com>
+Preparation Date: January 24, 2002
+Preparer:	  Evan Hunt <evanh@caldera.com>
 
 Instructions:	Preparing Samba Packages for SCO OpenServer
 ===============================================================
 
 We provide support only for current versions of SCO OpenServer
 
-The file samba-2.2.3-osr5.patch is a patch file suitable for use
-with the patch command as follows:
-
-        # cd ../../../source
-        # patch -p 0 -i ../packaging/Caldera/OpenServer/samba-2.2-osr5.patch
-
-The files modified by this patch are:
-    utils/torture.c
-    utils/locktest.c
-    utils/locktest2.c
-
-This patch should only be necessary until these changes are accepted
-back into the 2.2 source tree. Until then, this patch must be applied
-prior to building Samba 2.2 on SCO OpenServer 5. 
-
 To produce the custom installable media images simply type (in this directory):
 	# ./Makevol
 
diff --git a/packaging/Caldera/OpenServer/docview.html b/packaging/Caldera/OpenServer/docview.html
index bf25f412308..585e0161533 100644
--- a/packaging/Caldera/OpenServer/docview.html
+++ b/packaging/Caldera/OpenServer/docview.html
@@ -11,18 +11,28 @@
 Samba is a suite of networking products that implement the
 Windows SMB and CIFS protocols on UNIX and Linux operating
 systems.  Samba enables your SCO OpenServer from Caldera system 
-as a file and print server for Windows and OS/2 systems.
+as a file and print server for Windows and OS/2 clients.
 
 <p>
-We recommend that you use the O'Reilly & Associates publication
+To order to activate Samba software, you must first configure it
+according to the instructions in
+<a href="./osr5config.html">"Configuring Samba on SCO OpenServer 
+systems"</a>.  
+We recommend that you consult the O'Reilly & Associates publication
 <a href="../using_samba/index.html" target="docs">"Using Samba"</a>
 
-to configure and administer your Samba server.  Links to Samba
-HOWTO documents and manual pages are also provided below.
+for further information on configuring and administering your Samba 
+server.  Links to Samba HOWTO documents and manual pages are also 
+provided below.
 
 <h3><a href="./samba.7.html" target="docs">Samba</a> Documentation</h3>
 
 <ul>
+ <li><b>Initial Configuration Instructions</b>
+   <ul>
+    <li><a href="./osr5config.html">Configuring 
+      Samba on SCO OpenServer systems</a>
+   </ul>
  <li><b>Books</b>
    <ul>
     <li><a href="../using_samba/index.html" target="docs">Using Samba</a> - by Robert Eckstein, David Collier-Brown and Peter Kelly.
@@ -35,7 +45,8 @@ HOWTO documents and manual pages are also provided below.
      <li><a href="./NT_Security.html">UNIX Permission Bits and Samba 2.x</a>
      <li><a href="./OS2-Client-HOWTO.html">OS/2 Clients and Samba</a>
      <li><a href="./printer_driver2.html">Printing under Samba 2.2.x</a>
-     <li><a href="./Integrating-with-Windows.html">Integrating Name Resolution and Authentication Services</a>
+     <li><a href="./Integrating-with-Windows.html">Integrating
+MS Windows networks with Samba</a>
      <li><a href="./Samba-HOWTO-Collection.html">Entire Collection (one file; includes developer information)</a>
    </ul>
  <li><b>Daemons</b>
diff --git a/packaging/Caldera/OpenServer/findsmb b/packaging/Caldera/OpenServer/findsmb
index 5d399123952..2e831c5f11a 100755
--- a/packaging/Caldera/OpenServer/findsmb
+++ b/packaging/Caldera/OpenServer/findsmb
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 # Prints info on all smb responding machines on a subnet.
 # This script needs to be run on a machine without nmbd running and be
@@ -15,7 +15,7 @@
 # that workgroup.
 #
 
-$SAMBABIN = "/usr/local/samba/bin";
+$SAMBABIN = "/usr/lib/samba/bin";
 
 for ($i = 0; $i < 2; $i++) {	# test for -d option and broadcast address
   $_ = shift;
@@ -65,15 +65,6 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 
   @name = grep(/<00>/,@nmblookup);
   $_ = @name[0];
-  if (not $_) {
-# try without the -r option
-    open(NMBLOOKUP,"$SAMBABIN/nmblookup -A $ip|") ||
-        die("Can't get nmb name list.\n");
-    @nmblookup = <NMBLOOKUP>;
-    close NMBLOOKUP;
-    @name = grep(/<00> - /,@nmblookup);
-    $_ = @name[0];
-  }
   if ($_) {                     # we have a netbios name
     if (/GROUP/) {		# is it a group name
 	($name, $aliases, $type, $length, @addresses) = 
@@ -88,7 +79,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 
 # do an smbclient command on the netbios name.
 
-    open(SMB,"$SAMBABIN/smbclient -N -L '$name' -I $ip -U% |") ||
+    open(SMB,"$SAMBABIN/smbclient -N -L $name -I $ip -U% |") ||
 	die("Can't do smbclient command.\n");
     @smb = <SMB>;
     close SMB;
@@ -104,7 +95,7 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
     @info = grep(/OS=/,@smb);
     $_ = @info[0];
     if ($_) {				# we found response
-      s/.*Domain=|OS=|Server=|\n//g;	# strip out descriptions to make line shorter
+      s/Domain=|OS=|Server=|\n//g;	# strip out descriptions to make line shorter
 
     } else {				# no OS= string in response (WIN95 client)
 
diff --git a/packaging/Caldera/OpenServer/initconfig b/packaging/Caldera/OpenServer/initconfig
index b391cf9444d..518d5962c43 100755
--- a/packaging/Caldera/OpenServer/initconfig
+++ b/packaging/Caldera/OpenServer/initconfig
@@ -8,8 +8,8 @@
 # do the initial configuration as well, and this script will become
 # unnecessary.
 
-CONF_SRC=/usr/lib/samba/lib/smb.conf.default
-CONF=/usr/lib/samba/lib/smb.conf
+CONF_SRC=/etc/samba.d/smb.conf.default
+CONF=/etc/samba.d/smb.conf
 
 # getyn: ask a question, return value indicates response
 
diff --git a/packaging/Caldera/OpenServer/pkg/cdmt.config b/packaging/Caldera/OpenServer/pkg/cdmt.config
index 8ea7e8c1ab6..9bf3f203f93 100644
--- a/packaging/Caldera/OpenServer/pkg/cdmt.config
+++ b/packaging/Caldera/OpenServer/pkg/cdmt.config
@@ -1,7 +1,7 @@
 MACROS:
 
 Samba_NAME	= Samba File and Print Server
-Samba_VER	= 2.2.2a
+Samba_VER	= 2.2.4a
 
 DEFAULT_EXEC_MODE = 0755
 
diff --git a/packaging/Caldera/OpenServer/pkg/cntl/ccs b/packaging/Caldera/OpenServer/pkg/cntl/ccs
index a01690712ac..c5e69e1b167 100755
--- a/packaging/Caldera/OpenServer/pkg/cntl/ccs
+++ b/packaging/Caldera/OpenServer/pkg/cntl/ccs
@@ -11,93 +11,8 @@ pkglist="$3"
 # Source in the standard functions library, ccsSetup.sh
 . ccsSetup.sh
 
-SPOOL=/var/spool/samba
-SVCS=/etc/services
-INET=/etc/inetd.conf
-LMHOST=/etc/lmhosts
-PREFIX=/usr/lib/samba
-
 PKG_DIR=${SSO_SHARED_ROOT}/cntl/packages
 
-#
-# Create /var/spool/samba, create an initial /etc/lmhosts, build the
-# codepages and setup swat to be run out of inetd on port 901
-#
-PostExport()
-{
-    [ -d $SPOOL ] || {
-         mkdir -p $SPOOL
-         chmod 1777 $SPOOL
-    }
-    if [ -f $LMHOST ]
-    then
-        grep localhost $LMHOST > /dev/null || {
-            echo 127.0.0.1 localhost >> $LMHOST
-        }
-    else
-        echo 127.0.0.1 localhost > $LMHOST
-    fi
-
-    cd ${PREFIX}/lib/codepages
-    for i in 437 737 775 850 852 861 866 932 936 949 950 1251
-    do
-        ${PREFIX}/bin/make_smbcodepage c $i \
-            ${PREFIX}/lib/codepages/src/codepage_def.$i \
-            ${PREFIX}/lib/codepages/codepage.$i
-    done
-    for i in 437 737 850 852 861 866 932 936 949 950 \
-         ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI8-R
-    do
-        ${PREFIX}/bin/make_unicodemap $i \
-            ${PREFIX}/lib/codepages/src/CP$i.TXT \
-            ${PREFIX}/lib/codepages/unicode_map.$i
-    done
-    
-    grep swat $SVCS > /dev/null || {
-         echo "swat    901/tcp    # Samba Web Administration Tool " >> $SVCS
-    }
-    
-    grep swat $INET > /dev/null || {
-     echo "swat stream tcp nowait root /usr/lib/samba/bin/swat swat " >> $INET
-    }
-    
-    kill -1 `ps -e | grep inetd | awk ' { print $1 } '`
-}
-
-DisableStop()
-{
-    /etc/init.d/samba disable > /dev/null 2>&1
-    /etc/init.d/samba stop > /dev/null 2>&1
-}
-
-#
-# Remove /var/spool/samba and delete inetd entries for swat
-#
-PostUnexport()
-{
-    [ -d $SPOOL ] && {
-         rm -rf $SPOOL
-    }
-
-    grep swat $SVCS > /dev/null && {
-         B=`basename $SVCS`
-         T=$B$$
-         grep -v swat $SVCS > /tmp/$T
-         cp /tmp/$T $SVCS
-         rm -f /tmp/$T
-    }
-    
-    grep swat $INET > /dev/null || {
-         B=`basename $INET`
-         T=$B$$
-         grep -v swat $INET > /tmp/$T
-         cp /tmp/$T $INET
-         rm -f /tmp/$T
-    }
-    
-    kill -1 `ps -e | grep inetd | awk ' { print $1 } '`
-}
-
 # call ccs in subsidiary packages with same arguments we were called with
 pkgCodes=`getPackageCode $pkglist`
 returnCode=$OK
@@ -114,11 +29,5 @@ for pkg in $pkgCodes; do
     fi
 done
     
-case "$step" in
-        POST_EXPORT) PostExport ;;
-        PRE_UNEXPORT) DisableStop ;;
-        POST_UNEXPORT) PostUnexport ;;
-esac
-
 exit $returnCode
 
diff --git a/packaging/Caldera/OpenServer/pkg/cntl/cqs b/packaging/Caldera/OpenServer/pkg/cntl/cqs
index 2edcae6f2c7..fec327a298d 100755
--- a/packaging/Caldera/OpenServer/pkg/cntl/cqs
+++ b/packaging/Caldera/OpenServer/pkg/cntl/cqs
@@ -49,56 +49,31 @@ cleanup()
 #
 Save_SSO_Upgrade_Config()
 {
-    if [ -f /etc/smbusers ]; then
-        ex_cmd cp -f /etc/smbusers $CCS_PERSISTENT_STORAGE/smbusers
+    if [ -f /etc/samba.d/smbusers ]; then
+        ex_cmd cp -f /etc/samba.d/smbusers $CCS_PERSISTENT_STORAGE/smbusers
     fi
-    if [ -f /usr/lib/samba/lib/smb.conf ]; then
-        ex_cmd cp -f /usr/lib/samba/lib/smb.conf $CCS_PERSISTENT_STORAGE/smb.conf
+    if [ -f /etc/samba.d/smbpasswd ]; then
+        ex_cmd cp -f /etc/samba.d/smbpasswd ${CCS_PERSISTENT_STORAGE}/smbpasswd
+    fi
+    if [ -f /etc/samba.d/smb.conf ]; then
+        ex_cmd cp -f /etc/samba.d/smb.conf ${CCS_PERSISTENT_STORAGE}/smb.conf
+    fi
+    if [ -f /etc/samba.d/lmhosts ]; then
+        ex_cmd cp -f /etc/samba.d/lmhosts ${CCS_PERSISTENT_STORAGE}/lmhosts
+    fi
+    if [ -f /etc/samba.d/printers.def ]; then
+        ex_cmd cp -f /etc/samba.d/printers.def \
+		${CCS_PERSISTENT_STORAGE}/printers.def
     fi
 
     return 0
 }
 
-#******************************************************************************
-# check_libsocket
-#
-# Check to see if libsocket.so.2 is installed on this system.  If not, print
-# a warning message and ask if the user wants to continue installation anyway.
-#******************************************************************************
-
-MSG_missLibrary="WARNING: Samba requires the library /usr/lib/libsocket.so.2
-	to install and run correctly.  That library does not exist
-	on this system.  It is provided in OpenServer releases
-	5.0.6a and higher."
-
-check_libsocket() {
-	if [ -f "/usr/lib/libsocket.so.2" ]; then
-		return $OK
-	else
-		echo "${MSG_missLibrary}"
-
-	        while echo "\n\tContinue installation? \c"
-        	do      read yn rest
-                	case $yn in
-                		+x|-x)  set $yn	;;
-                		[yY]*)  return $OK ;;
-                		[nN]*)  cleanup $FAIL ;;
-                		*)      echo "\tPlease answer y or n" ;;
-			esac
-        	done
-	fi
-}
-
-
 ################################################################################
 # main Main MAIN
 #
 trap "cleanup $FAIL" 1 2 3 15
 
-[ "$customMode" = "LAYERED" ] && {
-	check_libsocket
-}
-
 # Parse keyword list to determine how custom was invoked, the installation type,
 # whether we running on the target CPU, and finally if we have access to 
 # the target's root filesystem.
diff --git a/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs b/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs
index 4b4ef6de517..ea86e009025 100755
--- a/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs
+++ b/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs
@@ -12,16 +12,16 @@ ccs_return_value=0
 
 PostExport()
 {
-	if [ -x /usr/bin/doctool ]; then
-		/usr/bin/doctool --add NetworkDoc/WinConnect/samba.desktop
-	fi
+    if [ -x /usr/bin/doctool ]; then
+        /usr/bin/doctool --add NetworkDoc/WinConnect/samba.desktop >&- 2>&-
+    fi
 }
 
 PreUnexport()
 {
-	if [ -x /usr/bin/doctool ]; then
-		/usr/bin/doctool --remove NetworkDoc/WinConnect/samba.desktop
-	fi
+    if [ -x /usr/bin/doctool ]; then
+        /usr/bin/doctool --remove NetworkDoc/WinConnect/samba.desktop >&- 2>&-
+    fi
 }
     
 case "$step" in
diff --git a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
index f4a72dac36c..eabf026eb4d 100644
--- a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
+++ b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
@@ -29,6 +29,30 @@ owner = root
 group = sys
 flags = 
 
+DIR:Control:SHARED:cntl/packages/Samba:
+mode  = 0755
+owner = root
+group = sys
+flags = 
+
+FILE:Control:SHARED:cntl/packages/Samba/ccs:
+mode  = 0755
+owner = root
+group = sys
+flags = 
+
+DIR:Control:SHARED:cntl/packages/SambaSWAT:
+mode  = 0755
+owner = root
+group = sys
+flags = 
+
+FILE:Control:SHARED:cntl/packages/SambaSWAT/ccs:
+mode  = 0755
+owner = root
+group = sys
+flags = 
+
 DIR:Control:SHARED:cntl/packages/SambaDOC:
 mode  = 0755
 owner = root
@@ -187,13 +211,6 @@ group = sys
 flags = 
 exportPath = /usr/lib/samba/bin/smbspool
 
-FILE:Samba:SHARED:usr/lib/samba/bin/smbsh:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/bin/smbsh
-
 FILE:Samba:SHARED:usr/lib/samba/bin/mksmbpasswd.sh:
 mode  = 0755
 owner = root
@@ -256,13 +273,6 @@ group = sys
 flags = 
 exportPath = /usr/lib/samba/sbin/debug2html
 
-FILE:Samba:SHARED:usr/lib/samba/sbin/smbtorture:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/sbin/smbtorture
-
 FILE:Samba:SHARED:usr/lib/samba/sbin/smbfilter:
 mode  = 0755
 owner = root
@@ -270,20 +280,6 @@ group = sys
 flags = 
 exportPath = /usr/lib/samba/sbin/smbfilter
 
-FILE:Samba:SHARED:usr/lib/samba/sbin/locktest2:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/sbin/locktest2
-
-FILE:Samba:SHARED:usr/lib/samba/sbin/masktest:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/sbin/masktest
-
 DIR:Samba:SHARED:usr/lib/samba/lib:
 mode  = 0755
 owner = root
@@ -505,6 +501,13 @@ group = sys
 flags = 
 exportPath = /etc/samba.d/smbusers
 
+FILE:Samba:CLIENT:etc/samba.d/lmhosts:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /etc/samba.d/lmhosts
+
 DIR:Samba:CLIENT:usr/lib/samba/var:
 mode  = 0755
 owner = root
@@ -517,10 +520,20 @@ owner = root
 group = sys
 flags = 
 exportPath = /var/log/samba.d
+exportPath = /usr/lib/samba/var/log
 
 DIR:Samba:CLIENT:usr/lib/samba/var/locks:
+mode  = 1777
+owner = root
+group = sys
+flags = 
+exportPath = /var/locks/samba.d
+exportPath = /usr/lib/samba/var/locks
+
+DIR:Samba:CLIENT:usr/lib/samba/var/spool:
 mode  = 0755
 owner = root
 group = sys
 flags = 
-exportPath = /var/locks/samba
+exportPath = /var/spool/samba
+exportPath = /usr/lib/samba/var/spool
diff --git a/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg b/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg
index df96635bccd..0ed9bdb72b8 100644
--- a/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg
+++ b/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg
@@ -11,6 +11,13 @@ owner = root
 group = sys
 flags = 
 
+FILE:SambaDOC:SHARED:doc/samba.desktop:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/share/meta/doc/NetworkDoc/WinConnect/samba.desktop
+
 FILE:SambaDOC:SHARED:doc/index.html:
 mode  = 0644
 owner = root
@@ -18,6 +25,20 @@ group = sys
 flags = 
 exportPath = /usr/share/doc/samba/help/index.html
 
+FILE:SambaDOC:SHARED:doc/osr5config.html:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/share/doc/samba/help/osr5config.html
+
+FILE:SambaDOC:SHARED:doc/callogo.gif:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/share/doc/samba/help/callogo.gif
+
 DIR:SambaDOC:SHARED:usr/lib:
 mode  = 0755
 owner = root
@@ -98,20 +119,6 @@ group = sys
 flags = 
 exportPath = /usr/man/man.1/smbcontrol.1
 
-FILE:SambaDOC:SHARED:usr/lib/samba/man/man.1/smbrun.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /usr/man/man.1/smbrun.1
-
-FILE:SambaDOC:SHARED:usr/lib/samba/man/man.1/smbsh.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /usr/man/man.1/smbsh.1
-
 FILE:SambaDOC:SHARED:usr/lib/samba/man/man.1/smbstatus.1:
 mode  = 0644
 owner = root
diff --git a/packaging/Caldera/OpenServer/pkg/input/SambaSWAT.pkg b/packaging/Caldera/OpenServer/pkg/input/SambaSWAT.pkg
index e50c6f20a2d..46dcc23c244 100644
--- a/packaging/Caldera/OpenServer/pkg/input/SambaSWAT.pkg
+++ b/packaging/Caldera/OpenServer/pkg/input/SambaSWAT.pkg
@@ -125,6 +125,14 @@ flags =
 exportPath = /usr/lib/samba/swat/help/Samba-HOWTO-Collection.html
 exportPath = /usr/share/doc/samba/help/Samba-HOWTO-Collection.html
 
+FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/Samba-LDAP-HOWTO.html:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/lib/samba/swat/help/Samba-LDAP-HOWTO.html
+exportPath = /usr/share/doc/samba/help/Samba-LDAP-HOWTO.html
+
 FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/UNIX_INSTALL.html:
 mode  = 0644
 owner = root
@@ -181,6 +189,14 @@ flags =
 exportPath = /usr/lib/samba/swat/help/nmblookup.1.html
 exportPath = /usr/share/doc/samba/help/nmblookup.1.html
 
+FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/pdbedit.8.html:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/lib/samba/swat/help/pdbedit.1.html
+exportPath = /usr/share/doc/samba/help/pdbedit.1.html
+
 FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/printer_driver2.html:
 mode  = 0644
 owner = root
@@ -197,22 +213,6 @@ flags =
 exportPath = /usr/lib/samba/swat/help/rpcclient.1.html
 exportPath = /usr/share/doc/samba/help/rpcclient.1.html
 
-FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/samba-pdc-faq.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/swat/help/samba-pdc-faq.html
-exportPath = /usr/share/doc/samba/help/samba-pdc-faq.html
-
-FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/samba-pdc-howto.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/swat/help/samba-pdc-howto.html
-exportPath = /usr/share/doc/samba/help/samba-pdc-howto.html
-
 FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/samba.7.html:
 mode  = 0644
 owner = root
@@ -293,22 +293,6 @@ flags =
 exportPath = /usr/lib/samba/swat/help/smbpasswd.8.html
 exportPath = /usr/share/doc/samba/help/smbpasswd.8.html
 
-FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/smbrun.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/swat/help/smbrun.1.html
-exportPath = /usr/share/doc/samba/help/smbrun.1.html
-
-FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/smbsh.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /usr/lib/samba/swat/help/smbsh.1.html
-exportPath = /usr/share/doc/samba/help/smbsh.1.html
-
 FILE:SambaSWAT:SHARED:usr/lib/samba/swat/help/smbspool.8.html:
 mode  = 0644
 owner = root
diff --git a/packaging/Caldera/OpenServer/smb.conf b/packaging/Caldera/OpenServer/smb.conf
index 1dab1e54dfb..973fac4539e 100644
--- a/packaging/Caldera/OpenServer/smb.conf
+++ b/packaging/Caldera/OpenServer/smb.conf
@@ -46,7 +46,7 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /usr/lib/samba/var/log.%m
+   log file = /var/log/samba.d/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
diff --git a/packaging/Caldera/OpenServer/smb.init b/packaging/Caldera/OpenServer/smb.init
index 535179a25a9..194b8a2bb29 100755
--- a/packaging/Caldera/OpenServer/smb.init
+++ b/packaging/Caldera/OpenServer/smb.init
@@ -8,22 +8,17 @@
 # Modified 17-Jul-99 by Ron Record (rr@sco.com) for use in SCO Skunkware
 #
 
-SAMBADIR=/usr/local/samba
+SAMBADIR=/usr/lib/samba
 RCSCRIPT=/etc/rc2.d/S99samba
 
-if [ ! -d /usr/bin ]
-then                    # /usr not mounted
-        exit
-fi
-
 killproc() {            # kill the named process(es)
-    if [ -f $SAMBADIR/var/locks/$1.pid ] 
+    if [ -f /var/locks/samba.d/$1.pid ] 
     then
-        kill `cat $SAMBADIR/var/locks/$1.pid`
+        kill `cat /var/locks/samba.d/$1.pid`
     else
-        pid=`/usr/bin/ps -e |
-             /usr/bin/grep $1 |
-             /usr/bin/sed -e 's/^  *//' -e 's/ .*//'`
+        pid=`/bin/ps -e |
+             /bin/grep $1 |
+             /bin/sed -e 's/^  *//' -e 's/ .*//'`
         [ "$pid" != "" ] && kill $pid
     fi
 }
@@ -32,15 +27,13 @@ start() {
 #
 # Edit these lines to suit your installation (paths, workgroup, host)
 #
-   $SAMBADIR/sbin/smbd -D -s $SAMBADIR/lib/smb.conf
-   $SAMBADIR/sbin/nmbd -D -s $SAMBADIR/lib/smb.conf
-   $SAMBADIR/sbin/winbindd 
+   $SAMBADIR/sbin/smbd -D -s /etc/samba.d/smb.conf
+   $SAMBADIR/sbin/nmbd -D -s /etc/samba.d/smb.conf
 }
 
 stop() {
    killproc nmbd
    killproc smbd
-   killproc winbindd
 }
 
 # Start/stop processes required for samba server
diff --git a/packaging/Caldera/OpenServer/smb.mkdev b/packaging/Caldera/OpenServer/smb.mkdev
index f474e9f8b76..df7e0adcc81 100755
--- a/packaging/Caldera/OpenServer/smb.mkdev
+++ b/packaging/Caldera/OpenServer/smb.mkdev
@@ -36,10 +36,12 @@ while true ; do
         prompt || exit 1
         case $cmd in
         1)      /usr/lib/samba/bin/initconfig
-		cp -f /etc/init.d/samba /etc/rc2.d/S92samba
+		/etc/init.d/samba enable
+		/etc/init.d/samba start
 		exit 0
 		;;
-	2)	rm -f /etc/rc2.d/S92samba
+	2)	/etc/init.d/samba disable
+		/etc/init.d/samba stop
 		exit 0
 		;;
 	esac
diff --git a/packaging/Caldera/OpenServer/smbadduser b/packaging/Caldera/OpenServer/smbadduser
index 2f38bf28f1a..d7a19626369 100755
--- a/packaging/Caldera/OpenServer/smbadduser
+++ b/packaging/Caldera/OpenServer/smbadduser
@@ -5,8 +5,8 @@
 unalias *
 set path = ($path)
 
-set smbpasswd = /etc/smbpasswd
-set user_map  = /etc/smbusers
+set smbpasswd = /etc/samba.d/smbpasswd
+set user_map  = /etc/samba.d/smbusers
 #
 # Set to site specific passwd command
 #
diff --git a/packaging/Caldera/OpenServer/smbprint b/packaging/Caldera/OpenServer/smbprint
index ec083eede62..7f50aadb46e 100755
--- a/packaging/Caldera/OpenServer/smbprint
+++ b/packaging/Caldera/OpenServer/smbprint
@@ -5,7 +5,7 @@
 # server and service.
 # For example you could have a printcap entry like this
 #
-# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/local/samba/smbprint
+# smb:lp=/dev/null:sd=/usr/spool/smb:sh:if=/usr/lib/samba/smbprint
 #
 # which would create a unix printer called "smb" that will print via this 
 # script. You will need to create the spool directory /usr/spool/smb with
@@ -27,7 +27,7 @@
 #	:cm=CD IBM Colorjet on 6th:\
 #	:sd=/var/spool/lpd/cdcolour:\
 #	:af=/var/spool/lpd/cdcolour/acct:\
-#	:if=/usr/local/etc/smbprint:\
+#	:if=/usr/lib/samba/smbprint:\
 #	:mx=0:\
 #	:lp=/dev/null:
 #
diff --git a/packaging/Caldera/UnixWare/Compile b/packaging/Caldera/UnixWare/Compile
index 2867e4d5ad5..c4870163053 100755
--- a/packaging/Caldera/UnixWare/Compile
+++ b/packaging/Caldera/UnixWare/Compile
@@ -7,14 +7,32 @@
 V=
 [ "$1" = "-n" ] && V=echo
 
-CC="cc -Kthread -Kalloca -I/usr/local/include -L/usr/local/lib"
+#CC="cc -Kthread -Kalloca -I/usr/local/include -L/usr/local/lib"
+CC="cc -Kthread -Kalloca"
 CPP="$CC -E"
 CFLAGS="-Xa -Dasm=__asm -DANSICPP -O3"
-LDFLAGS="-L/usr/local/lib"
-CXX="CC -I/usr/local/include"
-CXXFLAGS="-O3 -I/usr/local/include/stl -L/usr/local/lib"
+#LDFLAGS="-L/usr/local/lib"
+LDFLAGS=
+#CXX="CC -I/usr/local/include"
+CXX="CC"
+#CXXFLAGS="-O3 -I/usr/local/include/stl -L/usr/local/lib"
+CXXFLAGS="-O3"
 RANLIB=true
-MAKE=/usr/local/bin/make
+
+if [ -x /usr/gnu/bin/make ]
+then
+    MAKE=/usr/gnu/bin/make
+elif [ -x /usr/local/bin/make ]
+then
+    MAKE=/usr/local/bin/make
+elif [ -x /usr/bin/make ]
+then
+    MAKE=/usr/bin/make
+else
+    echo "Can't find make - exiting"
+    exit 1
+fi
+
 if [ "$V" = "echo" ]
 then
     echo "exporting the following shell variables:"
@@ -34,17 +52,17 @@ if [ "$V" = "echo" ]
 then
     echo "cd ../../../source"
     echo "rm -f mout-1 mout-2 mout-3 mout-4"
-    echo "make all 2>&1 | tee mout-1"
-    echo "make smbfilter smbtorture debug2html 2>&1 | tee mout-2"
-    echo "make bin/smbspool smbwrapper bin/wbinfo 2>&1 | tee mout-3"
-    echo "make masktest locktest locktest2 2>&1 | tee mout-3"
+    echo "$MAKE all 2>&1 | tee mout-1"
+    echo "$MAKE smbfilter smbtorture debug2html 2>&1 | tee mout-2"
+    echo "$MAKE bin/smbspool smbwrapper bin/wbinfo 2>&1 | tee mout-3"
+    echo "$MAKE masktest locktest locktest2 2>&1 | tee mout-3"
 else
     cd ../../../source
     rm -f mout-1 mout-2 mout-3 mout-4
-    make all 2>&1 | tee mout-1
-    make smbfilter smbtorture debug2html 2>&1 | tee mout-2
-    make bin/smbspool smbwrapper bin/wbinfo 2>&1 | tee mout-3
-    make masktest locktest locktest2 2>&1 | tee mout-3
+    $MAKE all 2>&1 | tee mout-1
+    $MAKE smbfilter smbtorture debug2html 2>&1 | tee mout-2
+    $MAKE bin/smbspool smbwrapper bin/wbinfo 2>&1 | tee mout-3
+    $MAKE masktest locktest locktest2 2>&1 | tee mout-3
 fi
 #
 # Not building :
diff --git a/packaging/Caldera/UnixWare/Configure b/packaging/Caldera/UnixWare/Configure
index 3914195606f..e899742ce90 100755
--- a/packaging/Caldera/UnixWare/Configure
+++ b/packaging/Caldera/UnixWare/Configure
@@ -7,15 +7,33 @@
 V=
 [ "$1" = "-n" ] && V=echo
 
-CC="cc -Kthread -Kalloca -I/usr/local/include -L/usr/local/lib"
+#CC="cc -Kthread -Kalloca -I/usr/local/include -L/usr/local/lib"
+CC="cc -Kthread -Kalloca"
 CPP="$CC -E"
 CFLAGS="-Xa -Dasm=__asm -DANSICPP -O3"
-LDFLAGS="-L/usr/local/lib"
-CXX="CC -I/usr/local/include"
-CXXFLAGS="-O3 -I/usr/local/include/stl -L/usr/local/lib"
+#LDFLAGS="-L/usr/local/lib"
+LDFLAGS=
+#CXX="CC -I/usr/local/include"
+CXX="CC"
+#CXXFLAGS="-O3 -I/usr/local/include/stl -L/usr/local/lib"
+CXXFLAGS="-O3"
 RANLIB=true
-MAKE=/usr/local/bin/make
-PREFIX=/usr/local/samba
+PREFIX=/usr/lib/samba
+
+if [ -x /usr/gnu/bin/make ]
+then
+    MAKE=/usr/gnu/bin/make
+elif [ -x /usr/local/bin/make ]
+then
+    MAKE=/usr/local/bin/make
+elif [ -x /usr/bin/make ]
+then
+    MAKE=/usr/bin/make
+else
+    echo "Can't find make - exiting"
+    exit 1
+fi
+
 if [ "$V" = "echo" ]
 then
     echo "exporting the following shell variables:"
diff --git a/packaging/Caldera/UnixWare/Install b/packaging/Caldera/UnixWare/Install
index 3fffc37d25a..a2d8da12eaa 100755
--- a/packaging/Caldera/UnixWare/Install
+++ b/packaging/Caldera/UnixWare/Install
@@ -7,7 +7,7 @@
 V=
 [ "$1" = "-n" ] && V=echo
 
-PREFIX=/usr/local/samba
+PREFIX=/usr/lib/samba
 HERE=`pwd`
 PKGDIR=packaging/Caldera/UnixWare
 
@@ -39,8 +39,7 @@ cd ../../..
 
 # Install standard binary files
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool \
-      smbsh smbwrapper.so 
+      make_smbcodepage make_unicodemap make_printerdef rpcclient smbspool
 do
 $V    install -m755 -s source/bin/$i ${BLDFIX}/bin
 done
diff --git a/packaging/Caldera/UnixWare/pkg/pkginfo b/packaging/Caldera/UnixWare/pkg/pkginfo
index c4d8bff0bb9..c35373d3523 100644
--- a/packaging/Caldera/UnixWare/pkg/pkginfo
+++ b/packaging/Caldera/UnixWare/pkg/pkginfo
@@ -1,9 +1,8 @@
 PKG="samba"
 NAME="Samba - A Windows SMB/CIFS fileserver for UNIX"
-VERSION="2.2"
-VENDOR="SCO"
-HOTLINE="1-800-SCO-UNIX"
-EMAIL="rr@sco.com"
+VERSION="2.2.4"
+VENDOR="Caldera"
+EMAIL="rr@caldera.com"
 CATEGORY="skunkware"
 CLASSES="samba"
 ARCH="i386"
diff --git a/packaging/Caldera/UnixWare/pkg/postinstall b/packaging/Caldera/UnixWare/pkg/postinstall
index 4e202ae3543..0cbdfad238e 100755
--- a/packaging/Caldera/UnixWare/pkg/postinstall
+++ b/packaging/Caldera/UnixWare/pkg/postinstall
@@ -3,13 +3,13 @@
 # Create /var/spool/samba, setup swat to be run out of inetd on port 901,
 # initialize the lmhosts file and create the codepage load files
 #
-# Written 10-Aug-1999 by Ronald Joe Record (rr@sco.com)
+# Written 10-Aug-1999 by Ronald Joe Record (rr@caldera.com)
 #
 
 SPOOL=/var/spool/samba
 SVCS=/etc/services
 INET=/etc/inetd.conf
-PREFIX=/usr/local/samba
+PREFIX=/usr/lib/samba
 LMHOST=/etc/lmhosts
 
 [ -d $SPOOL ] || {
@@ -22,7 +22,7 @@ grep swat $SVCS > /dev/null || {
 }
 
 grep swat $INET > /dev/null || {
-     echo "swat stream tcp nowait root /usr/local/samba/bin/swat swat " >> $INET
+     echo "swat stream tcp nowait root /usr/lib/samba/sbin/swat swat " >> $INET
 }
 
 if [ -f $LMHOST ]
diff --git a/packaging/Caldera/UnixWare/pkg/prototype b/packaging/Caldera/UnixWare/pkg/prototype
index 13a64b6feb1..5424e2cfc9e 100644
--- a/packaging/Caldera/UnixWare/pkg/prototype
+++ b/packaging/Caldera/UnixWare/pkg/prototype
@@ -8,303 +8,296 @@ d samba etc/init.d 0755 root sys
 f samba etc/init.d/samba 0755 root sys
 f samba etc/smbusers 0644 root sys
 d samba usr 0755 root sys
-d samba usr/local 0755 root sys
-d samba usr/local/samba 0755 root sys
-d samba usr/local/samba/bin 0755 root sys
-f samba usr/local/samba/bin/nmblookup 0755 root sys
-f samba usr/local/samba/bin/smbclient 0755 root sys
-f samba usr/local/samba/bin/smbpasswd 0755 root sys
-f samba usr/local/samba/bin/smbstatus 0755 root sys
-f samba usr/local/samba/bin/testparm 0755 root sys
-f samba usr/local/samba/bin/testprns 0755 root sys
-f samba usr/local/samba/bin/make_smbcodepage 0755 root sys
-f samba usr/local/samba/bin/make_unicodemap 0755 root sys
-f samba usr/local/samba/bin/make_printerdef 0755 root sys
-f samba usr/local/samba/bin/rpcclient 0755 root sys
-f samba usr/local/samba/bin/smbspool 0755 root sys
-f samba usr/local/samba/bin/smbsh 0755 root sys
-f samba usr/local/samba/bin/smbwrapper.so 0755 root sys
-f samba usr/local/samba/bin/mksmbpasswd.sh 0755 root sys
-f samba usr/local/samba/bin/smbtar 0755 root sys
-f samba usr/local/samba/bin/smbprint 0755 root sys
-f samba usr/local/samba/bin/findsmb 0755 root sys
-f samba usr/local/samba/bin/smbadduser 0755 root sys
-d samba usr/local/samba/sbin 0755 root sys
-f samba usr/local/samba/sbin/smbd 0755 root sys
-f samba usr/local/samba/sbin/nmbd 0755 root sys
-f samba usr/local/samba/sbin/swat 0755 root sys
-f samba usr/local/samba/sbin/debug2html 0755 root sys
-f samba usr/local/samba/sbin/smbtorture 0755 root sys
-f samba usr/local/samba/sbin/smbfilter 0755 root sys
-f samba usr/local/samba/sbin/locktest2 0755 root sys
-f samba usr/local/samba/sbin/masktest 0755 root sys
-d samba usr/local/samba/swat 0755 root sys
-d samba usr/local/samba/swat/using_samba 0755 root sys
-d samba usr/local/samba/swat/using_samba/gifs 0755 root sys
-f samba usr/local/samba/swat/using_samba/gifs/index.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/gifs/samba.s.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/gifs/txthome.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/gifs/txtnexta.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/gifs/txtpreva.gif 0644 root sys
-d samba usr/local/samba/swat/using_samba/figs 0755 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0101.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0102.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0103.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0104.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0105.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0106.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0107.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0108.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0109.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0110.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0111.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0112.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0113.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0114.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0201.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0202.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0203.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0204.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0301.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0302.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0303.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0304.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0305.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0306.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0307.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0308.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0309.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0310.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0311.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0312.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0313.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0314.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0315.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0316.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0317.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0318.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0319.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0320.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0321.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0322.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0323.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0324.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0325.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0326.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0327.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0328.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0401.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0402.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0403.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0404.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0405.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0406.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0407.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0501.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0502.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0503.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0504.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0505.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0506.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0507.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0508.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0601.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0602.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0603.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0604.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0605.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0606.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0701.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0702.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0703.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0704.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0705.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0706.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0707.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0708.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0709.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0801.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0802.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0803.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0804.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0805.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0901.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0902.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0903.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0904.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.0905.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.aa01.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.ab01.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/figs/sam.ab02.gif 0644 root sys
-f samba usr/local/samba/swat/using_samba/appa_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appa_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appa_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appa_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appa_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appb_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appb_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appb_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appc_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appd_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appe_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/appf_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_06.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_07.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch01_08.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch02_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch02_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch02_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch02_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch02_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch02_06.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch03_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch03_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch03_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_06.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_07.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch04_08.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch05_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch05_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch05_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch05_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch05_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch06_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch06_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch06_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch06_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch06_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch06_06.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch07_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch07_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch07_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_04.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_05.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_06.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch08_07.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch09_01.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch09_02.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/ch09_03.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/index.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/inx.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/licenseinfo.html 0644 root sys
-f samba usr/local/samba/swat/using_samba/this_edition.html 0644 root sys
-d samba usr/local/samba/swat/images 0755 root sys
-f samba usr/local/samba/swat/images/globals.gif 0644 root sys
-f samba usr/local/samba/swat/images/home.gif 0644 root sys
-f samba usr/local/samba/swat/images/passwd.gif 0644 root sys
-f samba usr/local/samba/swat/images/printers.gif 0644 root sys
-f samba usr/local/samba/swat/images/samba.gif 0644 root sys
-f samba usr/local/samba/swat/images/shares.gif 0644 root sys
-f samba usr/local/samba/swat/images/status.gif 0644 root sys
-f samba usr/local/samba/swat/images/viewconfig.gif 0644 root sys
-d samba usr/local/samba/swat/help 0755 root sys
-f samba usr/local/samba/swat/help/welcome.html 0644 root sys
-f samba usr/local/samba/swat/help/DOMAIN_MEMBER.html 0644 root sys
-f samba usr/local/samba/swat/help/NT_Security.html 0644 root sys
-f samba usr/local/samba/swat/help/findsmb.1.html 0644 root sys
-f samba usr/local/samba/swat/help/lmhosts.5.html 0644 root sys
-f samba usr/local/samba/swat/help/make_smbcodepage.1.html 0644 root sys
-f samba usr/local/samba/swat/help/nmbd.8.html 0644 root sys
-f samba usr/local/samba/swat/help/nmblookup.1.html 0644 root sys
-f samba usr/local/samba/swat/help/rpcclient.1.html 0644 root sys
-f samba usr/local/samba/swat/help/samba-pdc-faq.html 0644 root sys
-f samba usr/local/samba/swat/help/samba-pdc-howto.html 0644 root sys
-f samba usr/local/samba/swat/help/samba.7.html 0644 root sys
-f samba usr/local/samba/swat/help/smb.conf.5.html 0644 root sys
-f samba usr/local/samba/swat/help/smbclient.1.html 0644 root sys
-f samba usr/local/samba/swat/help/smbcontrol.1.html 0644 root sys
-f samba usr/local/samba/swat/help/smbd.8.html 0644 root sys
-f samba usr/local/samba/swat/help/smbpasswd.5.html 0644 root sys
-f samba usr/local/samba/swat/help/smbpasswd.8.html 0644 root sys
-f samba usr/local/samba/swat/help/smbrun.1.html 0644 root sys
-f samba usr/local/samba/swat/help/smbsh.1.html 0644 root sys
-f samba usr/local/samba/swat/help/smbspool.8.html 0644 root sys
-f samba usr/local/samba/swat/help/smbstatus.1.html 0644 root sys
-f samba usr/local/samba/swat/help/smbtar.1.html 0644 root sys
-f samba usr/local/samba/swat/help/swat.8.html 0644 root sys
-f samba usr/local/samba/swat/help/testparm.1.html 0644 root sys
-f samba usr/local/samba/swat/help/testprns.1.html 0644 root sys
-f samba usr/local/samba/swat/help/wbinfo.1.html 0644 root sys
-f samba usr/local/samba/swat/help/winbindd.8.html 0644 root sys
-d samba usr/local/samba/swat/include 0755 root sys
-f samba usr/local/samba/swat/include/footer.html 0644 root sys
-f samba usr/local/samba/swat/include/header.html 0644 root sys
-f samba usr/local/samba/swat/README 0644 root sys
-d samba usr/local/samba/man 0755 root sys
-d samba usr/local/samba/man/man1 0755 root sys
-f samba usr/local/samba/man/man1/findsmb.1 0644 root sys
-f samba usr/local/samba/man/man1/make_smbcodepage.1 0644 root sys
-f samba usr/local/samba/man/man1/make_unicodemap.1 0644 root sys
-f samba usr/local/samba/man/man1/nmblookup.1 0644 root sys
-f samba usr/local/samba/man/man1/smbclient.1 0644 root sys
-f samba usr/local/samba/man/man1/smbcontrol.1 0644 root sys
-f samba usr/local/samba/man/man1/smbrun.1 0644 root sys
-f samba usr/local/samba/man/man1/smbsh.1 0644 root sys
-f samba usr/local/samba/man/man1/smbstatus.1 0644 root sys
-f samba usr/local/samba/man/man1/smbtar.1 0644 root sys
-f samba usr/local/samba/man/man1/testparm.1 0644 root sys
-f samba usr/local/samba/man/man1/testprns.1 0644 root sys
-f samba usr/local/samba/man/man1/wbinfo.1 0644 root sys
-d samba usr/local/samba/man/man5 0755 root sys
-f samba usr/local/samba/man/man5/smb.conf.5 0644 root sys
-f samba usr/local/samba/man/man5/lmhosts.5 0644 root sys
-f samba usr/local/samba/man/man5/smbpasswd.5 0644 root sys
-d samba usr/local/samba/man/man7 0755 root sys
-f samba usr/local/samba/man/man7/samba.7 0644 root sys
-d samba usr/local/samba/man/man8 0755 root sys
-f samba usr/local/samba/man/man8/smbd.8 0644 root sys
-f samba usr/local/samba/man/man8/nmbd.8 0644 root sys
-f samba usr/local/samba/man/man8/smbpasswd.8 0644 root sys
-f samba usr/local/samba/man/man8/swat.8 0644 root sys
-f samba usr/local/samba/man/man8/smbmount.8 0644 root sys
-f samba usr/local/samba/man/man8/smbmnt.8 0644 root sys
-f samba usr/local/samba/man/man8/smbumount.8 0644 root sys
-d samba usr/local/samba/var 0755 root sys
-d samba usr/local/samba/var/locks 0755 root sys
-d samba usr/local/samba/lib 0755 root sys
-d samba usr/local/samba/lib/codepages 0755 root sys
-d samba usr/local/samba/lib/codepages/src 0755 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.437 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.737 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.775 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.850 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.852 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.861 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.866 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.932 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.936 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.949 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.950 0644 root sys
-f samba usr/local/samba/lib/codepages/src/codepage_def.1251 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP437.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP737.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP850.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP852.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP861.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP866.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP932.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP936.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP949.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CP950.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CPISO8859-1.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CPISO8859-2.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CPISO8859-5.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CPISO8859-7.TXT 0644 root sys
-f samba usr/local/samba/lib/codepages/src/CPKOI8-R.TXT 0644 root sys
-f samba usr/local/samba/lib/smb.conf 0644 root sys
-d samba usr/local/man 0755 root sys
-d samba usr/local/man/html 0755 root sys
-s samba usr/local/man/html/samba=/usr/local/samba/swat/using_samba
+d samba usr/lib 0755 root sys
+d samba usr/lib/samba 0755 root sys
+d samba usr/lib/samba/bin 0755 root sys
+f samba usr/lib/samba/bin/nmblookup 0755 root sys
+f samba usr/lib/samba/bin/smbclient 0755 root sys
+f samba usr/lib/samba/bin/smbpasswd 0755 root sys
+f samba usr/lib/samba/bin/smbstatus 0755 root sys
+f samba usr/lib/samba/bin/testparm 0755 root sys
+f samba usr/lib/samba/bin/testprns 0755 root sys
+f samba usr/lib/samba/bin/make_smbcodepage 0755 root sys
+f samba usr/lib/samba/bin/make_unicodemap 0755 root sys
+f samba usr/lib/samba/bin/make_printerdef 0755 root sys
+f samba usr/lib/samba/bin/rpcclient 0755 root sys
+f samba usr/lib/samba/bin/smbspool 0755 root sys
+f samba usr/lib/samba/bin/mksmbpasswd.sh 0755 root sys
+f samba usr/lib/samba/bin/smbtar 0755 root sys
+f samba usr/lib/samba/bin/smbprint 0755 root sys
+f samba usr/lib/samba/bin/findsmb 0755 root sys
+f samba usr/lib/samba/bin/smbadduser 0755 root sys
+d samba usr/lib/samba/sbin 0755 root sys
+f samba usr/lib/samba/sbin/smbd 0755 root sys
+f samba usr/lib/samba/sbin/nmbd 0755 root sys
+f samba usr/lib/samba/sbin/swat 0755 root sys
+f samba usr/lib/samba/sbin/debug2html 0755 root sys
+f samba usr/lib/samba/sbin/smbtorture 0755 root sys
+f samba usr/lib/samba/sbin/smbfilter 0755 root sys
+f samba usr/lib/samba/sbin/locktest2 0755 root sys
+f samba usr/lib/samba/sbin/masktest 0755 root sys
+d samba usr/lib/samba/swat 0755 root sys
+d samba usr/lib/samba/swat/using_samba 0755 root sys
+d samba usr/lib/samba/swat/using_samba/gifs 0755 root sys
+f samba usr/lib/samba/swat/using_samba/gifs/index.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/gifs/samba.s.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/gifs/txthome.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/gifs/txtnexta.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/gifs/txtpreva.gif 0644 root sys
+d samba usr/lib/samba/swat/using_samba/figs 0755 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0101.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0102.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0103.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0104.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0105.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0106.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0107.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0108.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0109.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0110.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0111.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0112.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0113.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0114.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0201.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0202.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0203.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0204.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0301.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0302.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0303.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0304.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0305.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0306.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0307.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0308.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0309.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0310.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0311.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0312.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0313.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0314.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0315.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0316.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0317.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0318.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0319.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0320.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0321.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0322.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0323.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0324.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0325.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0326.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0327.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0328.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0401.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0402.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0403.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0404.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0405.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0406.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0407.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0501.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0502.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0503.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0504.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0505.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0506.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0507.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0508.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0601.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0602.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0603.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0604.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0605.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0606.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0701.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0702.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0703.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0704.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0705.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0706.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0707.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0708.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0709.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0801.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0802.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0803.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0804.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0805.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0901.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0902.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0903.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0904.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.0905.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.aa01.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.ab01.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/figs/sam.ab02.gif 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appa_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appa_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appa_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appa_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appa_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appb_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appb_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appb_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appc_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appd_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appe_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/appf_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_06.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_07.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch01_08.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch02_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch02_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch02_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch02_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch02_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch02_06.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch03_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch03_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch03_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_06.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_07.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch04_08.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch05_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch05_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch05_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch05_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch05_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch06_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch06_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch06_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch06_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch06_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch06_06.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch07_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch07_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch07_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_04.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_05.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_06.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch08_07.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch09_01.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch09_02.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/ch09_03.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/index.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/inx.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/licenseinfo.html 0644 root sys
+f samba usr/lib/samba/swat/using_samba/this_edition.html 0644 root sys
+d samba usr/lib/samba/swat/images 0755 root sys
+f samba usr/lib/samba/swat/images/globals.gif 0644 root sys
+f samba usr/lib/samba/swat/images/home.gif 0644 root sys
+f samba usr/lib/samba/swat/images/passwd.gif 0644 root sys
+f samba usr/lib/samba/swat/images/printers.gif 0644 root sys
+f samba usr/lib/samba/swat/images/samba.gif 0644 root sys
+f samba usr/lib/samba/swat/images/shares.gif 0644 root sys
+f samba usr/lib/samba/swat/images/status.gif 0644 root sys
+f samba usr/lib/samba/swat/images/viewconfig.gif 0644 root sys
+d samba usr/lib/samba/swat/help 0755 root sys
+f samba usr/lib/samba/swat/help/welcome.html 0644 root sys
+f samba usr/lib/samba/swat/help/DOMAIN_MEMBER.html 0644 root sys
+f samba usr/lib/samba/swat/help/NT_Security.html 0644 root sys
+f samba usr/lib/samba/swat/help/findsmb.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/lmhosts.5.html 0644 root sys
+f samba usr/lib/samba/swat/help/make_smbcodepage.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/nmbd.8.html 0644 root sys
+f samba usr/lib/samba/swat/help/nmblookup.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/rpcclient.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/samba.7.html 0644 root sys
+f samba usr/lib/samba/swat/help/smb.conf.5.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbclient.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbcontrol.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbd.8.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbpasswd.5.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbpasswd.8.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbsh.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbspool.8.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbstatus.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/smbtar.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/swat.8.html 0644 root sys
+f samba usr/lib/samba/swat/help/testparm.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/testprns.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/wbinfo.1.html 0644 root sys
+f samba usr/lib/samba/swat/help/winbindd.8.html 0644 root sys
+d samba usr/lib/samba/swat/include 0755 root sys
+f samba usr/lib/samba/swat/include/footer.html 0644 root sys
+f samba usr/lib/samba/swat/include/header.html 0644 root sys
+f samba usr/lib/samba/swat/README 0644 root sys
+d samba usr/lib/samba/man 0755 root sys
+d samba usr/lib/samba/man/man1 0755 root sys
+f samba usr/lib/samba/man/man1/findsmb.1 0644 root sys
+f samba usr/lib/samba/man/man1/make_smbcodepage.1 0644 root sys
+f samba usr/lib/samba/man/man1/make_unicodemap.1 0644 root sys
+f samba usr/lib/samba/man/man1/nmblookup.1 0644 root sys
+f samba usr/lib/samba/man/man1/smbclient.1 0644 root sys
+f samba usr/lib/samba/man/man1/smbcontrol.1 0644 root sys
+f samba usr/lib/samba/man/man1/smbsh.1 0644 root sys
+f samba usr/lib/samba/man/man1/smbstatus.1 0644 root sys
+f samba usr/lib/samba/man/man1/smbtar.1 0644 root sys
+f samba usr/lib/samba/man/man1/testparm.1 0644 root sys
+f samba usr/lib/samba/man/man1/testprns.1 0644 root sys
+f samba usr/lib/samba/man/man1/wbinfo.1 0644 root sys
+d samba usr/lib/samba/man/man5 0755 root sys
+f samba usr/lib/samba/man/man5/smb.conf.5 0644 root sys
+f samba usr/lib/samba/man/man5/lmhosts.5 0644 root sys
+f samba usr/lib/samba/man/man5/smbpasswd.5 0644 root sys
+d samba usr/lib/samba/man/man7 0755 root sys
+f samba usr/lib/samba/man/man7/samba.7 0644 root sys
+d samba usr/lib/samba/man/man8 0755 root sys
+f samba usr/lib/samba/man/man8/smbd.8 0644 root sys
+f samba usr/lib/samba/man/man8/nmbd.8 0644 root sys
+f samba usr/lib/samba/man/man8/smbpasswd.8 0644 root sys
+f samba usr/lib/samba/man/man8/swat.8 0644 root sys
+f samba usr/lib/samba/man/man8/smbmount.8 0644 root sys
+f samba usr/lib/samba/man/man8/smbmnt.8 0644 root sys
+f samba usr/lib/samba/man/man8/smbumount.8 0644 root sys
+d samba usr/lib/samba/var 0755 root sys
+d samba usr/lib/samba/var/locks 0755 root sys
+d samba usr/lib/samba/lib 0755 root sys
+d samba usr/lib/samba/lib/codepages 0755 root sys
+d samba usr/lib/samba/lib/codepages/src 0755 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.437 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.737 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.775 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.850 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.852 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.861 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.866 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.932 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.936 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.949 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.950 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/codepage_def.1251 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP437.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP737.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP850.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP852.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP861.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP866.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP932.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP936.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP949.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CP950.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CPISO8859-1.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CPISO8859-2.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CPISO8859-5.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CPISO8859-7.TXT 0644 root sys
+f samba usr/lib/samba/lib/codepages/src/CPKOI8-R.TXT 0644 root sys
+f samba usr/lib/samba/lib/smb.conf 0644 root sys
+d samba usr/man 0755 root sys
+s samba usr/man/html.1samba=/usr/lib/samba/swat/using_samba
diff --git a/packaging/Caldera/UnixWare/smb.init b/packaging/Caldera/UnixWare/smb.init
index 535179a25a9..ce6c6fa4b38 100755
--- a/packaging/Caldera/UnixWare/smb.init
+++ b/packaging/Caldera/UnixWare/smb.init
@@ -34,13 +34,11 @@ start() {
 #
    $SAMBADIR/sbin/smbd -D -s $SAMBADIR/lib/smb.conf
    $SAMBADIR/sbin/nmbd -D -s $SAMBADIR/lib/smb.conf
-   $SAMBADIR/sbin/winbindd 
 }
 
 stop() {
    killproc nmbd
    killproc smbd
-   killproc winbindd
 }
 
 # Start/stop processes required for samba server
author	Jeremy Allison <jra@samba.org>	2002-04-30 13:28:41 +0000
committer	Jeremy Allison <jra@samba.org>	2002-04-30 13:28:41 +0000
commit	d04b55f2186fb8af998cf61c576771a5f72f4892 (patch)
tree	9ff8c3a7cf34cefc0ee9a550a3bb1236a9e77595 /packaging/Caldera
parent	73267ca42d9eddabb71b31b4c5068ebbe7bc9f7c (diff)
download	samba-d04b55f2186fb8af998cf61c576771a5f72f4892.tar.gz samba-d04b55f2186fb8af998cf61c576771a5f72f4892.tar.xz samba-d04b55f2186fb8af998cf61c576771a5f72f4892.zip