Merge for release.

Jeremy

15 files changed, 337 insertions, 1603 deletions

diff --git a/packaging/Caldera/OpenLinux/findsmb b/packaging/Caldera/OpenLinux/findsmb
index 986c2481779..fb178f91c1c 100755
--- a/packaging/Caldera/OpenLinux/findsmb
+++ b/packaging/Caldera/OpenLinux/findsmb
@@ -63,8 +63,17 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 
 # get the first <00> name
 
-  @name = grep(/<00>/,@nmblookup);
+  @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) = 
@@ -79,7 +88,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;
@@ -95,7 +104,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/OpenLinux/samba.pam b/packaging/Caldera/OpenLinux/samba.pam
index 123fc353e28..821c9046a6f 100644
--- a/packaging/Caldera/OpenLinux/samba.pam
+++ b/packaging/Caldera/OpenLinux/samba.pam
@@ -3,11 +3,47 @@
 #
 # The PAM configuration file for the `samba' service
 #
-auth       required     /lib/security/pam_pwdb.so nullok nodelay # audit
-# auth       required     /lib/security/pam_smbpass.so nodelay
-# auth       sufficient     /lib/security/pam_winbind.so 
-account    required     /lib/security/pam_pwdb.so nodelay # audit
-# account    sufficient     /lib/security/pam_winbind.so 
-session    required     /lib/security/pam_pwdb.so nodelay
-password   required     /lib/security/pam_pwdb.so shadow md5
-# password   required     /lib/security/pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf
+# Note: Only one section should be active at a time.
+#       Uncomment only those features needed. The default is a minimal implementation.
+#
+# --------------------------------------------------------------------------------
+# This example uses the standard System Files (/etc/passwd,/etc/shadow,/etc/group)
+#   and uses a very vanila PAM configuration
+#
+# auth       requisite    pam_securetty.so
+# auth       requisite    pam_nologin.so
+# auth       optional     pam_env.so
+auth       required     pam_pwdb.so       nullok nodelay # audit
+account    required     pam_pwdb.so       nodelay # audit
+# session    required     pam_mkhomedir.so
+session    required     pam_pwdb.so       nodelay
+password   required     pam_pwdb.so       nodelay # shadow md5 audit
+#
+# --------------------------------------------------------------------------------
+# This example uses PAM smbpass
+#
+# auth       requisite    pam_securetty.so
+# auth       requisite    pam_nologin.so
+# auth       optional     pam_env.so
+# auth       required     pam_smbpass.so    nodelay
+# account    required     pam_pwdb.so       nodelay # audit
+# account    sufficient   pam_winbind.so 
+# session    required     pam_mkhomedir.so
+# session    required     pam_pwdb.so       nodelay
+# password   required     pam_pwdb.so       shadow md5
+# password   required     pam_smbpass.so    nodelay smbconf=/etc/samba.d/smb.conf
+#
+# --------------------------------------------------------------------------------
+# This example uses PAM WinBind
+#
+# auth       requisite    pam_securetty.so
+# auth       requisite    pam_nologin.so
+# auth       optional     pam_env.so
+# auth       sufficient   pam_winbind.so 
+# auth       sufficient   pam_pwdb.so       shadow nullok use_first_pass
+# account    required     pam_pwdb.so       nodelay # audit
+# account    sufficient   pam_winbind.so 
+# session    required     pam_mkhomedir.so
+# session    required     pam_pwdb.so       nodelay
+# password   required     pam_pwdb.so       shadow md5
+#
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
index 73286c0b8aa..13c432882cf 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
@@ -31,7 +31,7 @@ Source: ftp://ftp.samba.org/pub/samba/%{Name}-%{Version}.tar.gz
 #Patch0: %{Name}-%{Version}-smbmount.patch
 #Patch1: %{Name}-%{Version}-install.patch
 #Patch2: %{Name}-%{Version}-smbconf.patch
-#Patch6: %{Name}-2.2.2-libsmbclient.patch
+Patch6: %{Name}-2.2.2-libsmbclient.patch
 
 %Package doc
 Group       	: Server/Network
@@ -246,10 +246,8 @@ done
   s:/usr/local/samba:/usr/bin/:g;
 '
 for i in htmldocs/DOMAIN_MEMBER.html htmldocs/Samba-HOWTO-Collection.html \
-         htmldocs/samba-pdc-faq.html htmldocs/samba-pdc-howto.html \
          htmldocs/smbclient.1.html htmldocs/smbd.8.html \
          docbook/projdoc/DOMAIN_MEMBER.sgml docbook/projdoc/DOMAIN_MEMBER.sgml \
-         docbook/faq/samba-pdc-faq.sgml docbook/howto/samba-pdc-howto.sgml \
          docbook/manpages/smbclient.1.sgml docbook/manpages/smbd.8.sgml \
 	 docbook/projdoc/ENCRYPTION.sgml manpages/smbclient.1 manpages/smbd.8 ; do
 %{fixUP} -vT docs/$i -e '
@@ -262,9 +260,6 @@ done
 %{fixUP} -vT docs/docbook/manpages/make_smbcodepage.1.sgml -e '
   s:/usr/local/samba:/usr/bin:g ;
 '
-%{fixUP} -vT docs/htmldocs/samba-pdc-faq.html -e '
-  s:/usr/local/src:/usr/src:g ;
-'
 # End of DirtyHack(TM)
 
 
@@ -348,7 +343,7 @@ 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/smbadduser.perl $DESTDIR/usr/bin/smbadduser
+cp -p $VVS/smbadduser.perl $DESTDIR/usr/bin/smbadduser
 #cp -p $VVS/make_smbpasswd.perl $DESTDIR/usr/bin/make_smbpasswd
 #cp -p $VVS/convertsmbpasswd.perl $DESTDIR/usr/bin/convertsmbpasswd
 #cp -p $VVS/updatesmbpasswd.perl $DESTDIR/usr/bin/updatesmbpasswd
diff --git a/packaging/Caldera/OpenLinux/samba2.spec.tmpl b/packaging/Caldera/OpenLinux/samba2.spec.tmpl
index 60d53f4e527..a570112c3c8 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec.tmpl
@@ -239,10 +239,8 @@ done
   s:/usr/local/samba:/usr/bin/:g;
 '
 for i in htmldocs/DOMAIN_MEMBER.html htmldocs/Samba-HOWTO-Collection.html \
-         htmldocs/samba-pdc-faq.html htmldocs/samba-pdc-howto.html \
          htmldocs/smbclient.1.html htmldocs/smbd.8.html \
          docbook/projdoc/DOMAIN_MEMBER.sgml htmldocs/DOMAIN_MEMBER.html \
-         docbook/faq/samba-pdc-faq.sgml docbook/howto/samba-pdc-howto.sgml \
          docbook/manpages/smbclient.1.sgml docbook/manpages/smbd.8.sgml \
 	 docbook/projdoc/ENCRYPTION.sgml manpages/smbclient.1 manpages/smbd.8 ; do
 %{fixUP} -vT docs/$i -e '
@@ -255,9 +253,6 @@ done
 %{fixUP} -vT docs/docbook/manpages/make_smbcodepage.1.sgml -e '
   s:/usr/local/samba:/usr/bin:g ;
 '
-%{fixUP} -vT docs/htmldocs/samba-pdc-faq.html -e '
-  s:/usr/local/src:/usr/src:g ;
-'
 # End of DirtyHack(TM)
 
 
@@ -279,10 +274,11 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--without-smbwrapper \
 	--with-smbmount \
 	--with-pam \
-       --with-pam_smbpass \
+	--with-pam_smbpass \
 	--with-quotas \
 	--with-syslog \
-	--with-utmp 
+	--win_winbind \
+	--with-utmp
 
 make LOGFILEBASE=/var/log/samba.d all
 make LOGFILEBASE=/var/log/samba.d nsswitch/libnss_wins.so
@@ -315,30 +311,28 @@ install -m 755 source/nsswitch/libnss_wins.so $DESTDIR/lib/libnss_wins.so.2.0
 ln -s libnss_wins.so.2.0 $DESTDIR/lib/libnss_wins.so.2
 ln -s libnss_wins.so.2.0 $DESTDIR/lib/libnss_wins.so
 
-# install -m 755 source/nsswitch/libnss_winbind.so $DESTDIR/lib/libnss_winbind.so.2.0
-# # Make link for winbind resolver
-# 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
-
-# install -m 755 source/nsswitch/pam_winbind.so $DESTDIR/lib/security
-
-# install -m 755 source/bin/wbinfo $DESTDIR/usr/bin
+# Add PAM smbpass and winbind facilities
+install -m 755 source/bin/pam_smbpass.so $DESTDIR/lib/security
+install -m 755 source/nsswitch/libnss_winbind.so $DESTDIR/lib/libnss_winbind.so.2.0
 
-for f in debug2html smbfilter smbspool; do
-       install -m 755 source/bin/$f $DESTDIR/usr/sbin/$f
-done
+# Make link for winbind resolver
+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
 
-cp -p $VVS/samba.init $DESTDIR/etc/rc.d/init.d/samba
-ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
+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
 
 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/smbadduser.perl $DESTDIR/usr/bin/smbadduser
+
+cp -p $VVS/smbadduser.perl $DESTDIR/usr/bin/smbadduser
 #cp -p $VVS/make_smbpasswd.perl $DESTDIR/usr/bin/make_smbpasswd
 #cp -p $VVS/convertsmbpasswd.perl $DESTDIR/usr/bin/convertsmbpasswd
 #cp -p $VVS/updatesmbpasswd.perl $DESTDIR/usr/bin/updatesmbpasswd
+
 cp -p $VVS/findsmb $DESTDIR/usr/bin
 cp -p $VVS/samba.daemon $DESTDIR/etc/sysconfig/daemons/samba
 cp -p $VVS/samba.pam $DESTDIR/etc/pam.d/samba
@@ -347,16 +341,18 @@ cp -p $VVS/README.home $DESTDIR/etc/skel/Samba/README.txt
 cp -p $VVS/README.Public $DESTDIR/%{LSBservedir}/Public/README.txt
 cp -p $VVS/README.profiles $DESTDIR/%{LSBservedir}/profiles/README.txt
 
-# Add PAM smbpass facility
-mv $DESTDIR/usr/bin/pam_smbpass.so $DESTDIR/lib/security
+install -m 755 $VVS/samba.init-lsb $DESTDIR/etc/rc.d/init.d/samba
+ln -s /etc/rc.d/init.d/samba $DESTDIR/usr/sbin
 
 for f in testparm testprns; do
   ln -s $f $DESTDIR/usr/bin/smb$f
   ln -s $f.1 $DESTDIR/usr/man/man1/smb$f.1
 done
-ln -s make_smbcodepage  $DESTDIR/usr/bin/mksmbcodepage
+
+#ln -s make_smbcodepage  $DESTDIR/usr/bin/mksmbcodepage
 #ln -s make_smbpasswd $DESTDIR/usr/bin/mksmbpasswd
 #ln -sf convert_smbpasswd $DESTDIR/usr/bin/convertsmbpasswd
+
 ln -s ../usr/bin/smbmount $DESTDIR/sbin/mount.smbfs
 
 cat <<-'EoH' > $DESTDIR%{EtcSamba}/lmhosts
@@ -364,9 +360,13 @@ cat <<-'EoH' > $DESTDIR%{EtcSamba}/lmhosts
 EoH
 
 
+# -------------------- Documentation -------------------------------
 DOCD="$DESTDIR/%{_defaultdocdir}/samba-%{Version}"; mkdir -p $DOCD
 ln -sf ../Copyrights/GPL-2.0  $DOCD/COPYING
-cp -p README README-smbmount Manifest Read-Manifest-Now $DOCD
+
+#cp -p README README-smbmount Manifest Read-Manifest-Now $DOCD
+
+cp -p README Manifest Read-Manifest-Now $DOCD
 cp -p WHATSNEW.txt Roadmap $DOCD
 cp -a docs examples $DOCD
 
@@ -405,8 +405,12 @@ Samba					base
 swat					swat
 %{_defaultdocdir}/samba-[^/]+/$		base
 %{_defaultdocdir}/samba- 		doc
+/lib/$					IGNORED
+/srv/$					IGNORED
 tmp					IGNORED
 man					IGNORED
+/src/$					IGNORED
+/usr/private/$				IGNORED
 @default@
 EOF
 cat << 'EOF' | %{mkLists} -f -a samba
@@ -415,11 +419,13 @@ Samba/README.txt			base
 ^/etc					config-IGNORED
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 libnss_wins.so				base
+pam_*					base
 %{_defaultdocdir}/samba-[^/]+/(COPYING|README$)	base
 %{_defaultdocdir}/samba- 		doc
 smb(mount|mnt|umount)			smbfs
 mount.smbfs				smbfs
 swat					swat
+libsmbclient				libsmbclient
 @default@
 EOF
 
@@ -430,6 +436,7 @@ EOF
 
 %Post
 lisa --SysV-init install samba S91 3:4:5 K09 0:1:2:6
+/sbin/ldconfig
 
 
 %Post -n swat
@@ -440,9 +447,19 @@ perl -pi -e '$s=1 if /^swat/;
 
 %PostUn
 lisa --SysV-init remove samba $1
+/sbin/ldconfig
 # We want to remove the browse.dat and wins.dat files so they can not
 # interfer with a new version of samba!
-rm -f /var/lock/samba/{browse,wins}.dat 
+rm -f /var/lock/samba/browse.dat
+rm -f /var/lock/samba/{brlock,connections,locking,messages}.tdb
+if [ -e /var/lock/samba.d/namelist.debug ]; then
+	rm -f /var/lock/samba.d/namelist.debug
+fi
+rm -f /var/lock/samba/unexpected.tdb
+rm -f /var/lock/samba/{smbd,nmbd}.pid
+
+# Note: We MUST keep:
+#	winbindd_*, sshare_info*, printing*, ntdrivers*
 
 
 %PostUn -n swat
diff --git a/packaging/Caldera/OpenServer/Configure b/packaging/Caldera/OpenServer/Configure
index 928aa971fb0..11826339d73 100755
--- a/packaging/Caldera/OpenServer/Configure
+++ b/packaging/Caldera/OpenServer/Configure
@@ -12,8 +12,11 @@ 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
-PREFIX=/usr/local/samba
+MAKE=/usr/gnu/bin/make
+PREFIX=/usr/lib/samba
+LIBDIR=/etc/samba.d
+PRIVATEDIR=/etc/samba.d
+LOCKDIR=/var/locks/samba.d
 if [ "$V" = "echo" ]
 then
     echo "exporting the following shell variables:"
@@ -41,6 +44,9 @@ if [ "$V" = "echo" ]
 then
     echo "./configure \
 	--prefix=${PREFIX} \
+	--libdir=${LIBDIR} \
+	--with-privatedir=${PRIVATEDIR} \
+        --with-lockdir={$LOCKDIR} \
 	--with-profile \
 	--with-syslog \
 	--with-utmp \
@@ -51,6 +57,9 @@ then
 else
     ./configure \
 	--prefix=${PREFIX} \
+	--libdir=${LIBDIR} \
+	--with-privatedir=${PRIVATEDIR} \
+        --with-lockdir={$LOCKDIR} \
 	--with-profile \
 	--with-syslog \
 	--with-utmp \
diff --git a/packaging/Caldera/OpenServer/Install b/packaging/Caldera/OpenServer/Install
index ab27b6f67fa..0df78034c7b 100755
--- a/packaging/Caldera/OpenServer/Install
+++ b/packaging/Caldera/OpenServer/Install
@@ -12,7 +12,7 @@ V=
 PATH=/usr/local/bin:$PATH
 export PATH
 
-PREFIX=/usr/local/samba
+PREFIX=/usr/lib/samba
 HERE=`pwd`
 PKGDIR=packaging/Caldera/OpenServer
 
@@ -20,6 +20,8 @@ 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/usr/lib/mkdev
+$V mkdir -p $BUILD_ROOT/doc
 $V mkdir -p ${BLDFIX}/bin
 $V mkdir -p ${BLDFIX}/sbin
 $V mkdir -p ${BLDFIX}/swat/using_samba/gifs
@@ -111,7 +113,6 @@ $V    install -m644 $i ${BLDFIX}/swat/using_samba/gifs
 done
 
 # Install the miscellany
-$V install -m644 swat/README ${BLDFIX}/swat
 $V install -m644 docs/manpages/smb.conf.5 ${BLDFIX}/man/man.5
 $V install -m644 docs/manpages/lmhosts.5 ${BLDFIX}/man/man.5
 $V install -m644 docs/manpages/smbpasswd.5 ${BLDFIX}/man/man.5
@@ -123,12 +124,16 @@ $V install -m644 docs/manpages/swat.8 ${BLDFIX}/man/man.8
 $V install -m644 docs/manpages/smbmount.8 ${BLDFIX}/man/man.8
 $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 ${BLDFIX}/lib/smb.conf
-$V install -m644 ${PKGDIR}/smbusers $BUILD_ROOT/etc/smbusers
+$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 -m755 ${PKGDIR}/smbprint ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/findsmb ${BLDFIX}/bin
 $V install -m755 ${PKGDIR}/smbadduser ${BLDFIX}/bin
+$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}/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 794bf546049..6e8915161c1 100644
--- a/packaging/Caldera/OpenServer/README
+++ b/packaging/Caldera/OpenServer/README
@@ -6,7 +6,7 @@ Instructions:	Preparing Samba Packages for SCO OpenServer
 
 We provide support only for current versions of SCO OpenServer
 
-The file samba-2.2-osr5.patch is a patch file suitable for use
+The file samba-2.2.3-osr5.patch is a patch file suitable for use
 with the patch command as follows:
 
         # cd ../../../source
diff --git a/packaging/Caldera/OpenServer/findsmb b/packaging/Caldera/OpenServer/findsmb
index bb91c784b89..5d399123952 100755
--- a/packaging/Caldera/OpenServer/findsmb
+++ b/packaging/Caldera/OpenServer/findsmb
@@ -65,6 +65,15 @@ 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) = 
@@ -79,7 +88,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;
@@ -95,7 +104,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/pkg/cdmt.config b/packaging/Caldera/OpenServer/pkg/cdmt.config
index e11c1961f22..8ea7e8c1ab6 100644
--- a/packaging/Caldera/OpenServer/pkg/cdmt.config
+++ b/packaging/Caldera/OpenServer/pkg/cdmt.config
@@ -1,5 +1,8 @@
 MACROS:
 
+Samba_NAME	= Samba File and Print Server
+Samba_VER	= 2.2.2a
+
 DEFAULT_EXEC_MODE = 0755
 
 DEFAULT_FILE_MODE = 0644
@@ -27,8 +30,7 @@ CONFIG:
 FLOPPY_MEDIA:
         device          = /dev/rfd0
         volumeSize      = 8000
-        distVendor      = SCO
-        distVersion     = 2.2
-        distCode        = SKUNK2000
-        paperLabel      = "SCO Skunkware Samba 2.2"
+        distVersion     = $Samba_VER
+        distCode        = SCO
+        paperLabel      = "Samba"
 
diff --git a/packaging/Caldera/OpenServer/pkg/cntl/ccs b/packaging/Caldera/OpenServer/pkg/cntl/ccs
index 0cb22490e47..a01690712ac 100755
--- a/packaging/Caldera/OpenServer/pkg/cntl/ccs
+++ b/packaging/Caldera/OpenServer/pkg/cntl/ccs
@@ -11,13 +11,13 @@ pkglist="$3"
 # Source in the standard functions library, ccsSetup.sh
 . ccsSetup.sh
 
-ccs_return_value=0
-
 SPOOL=/var/spool/samba
 SVCS=/etc/services
 INET=/etc/inetd.conf
 LMHOST=/etc/lmhosts
-PREFIX=/usr/local/samba
+PREFIX=/usr/lib/samba
+
+PKG_DIR=${SSO_SHARED_ROOT}/cntl/packages
 
 #
 # Create /var/spool/samba, create an initial /etc/lmhosts, build the
@@ -58,7 +58,7 @@ PostExport()
     }
     
     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/bin/swat swat " >> $INET
     }
     
     kill -1 `ps -e | grep inetd | awk ' { print $1 } '`
@@ -97,6 +97,22 @@ PostUnexport()
     
     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
+for pkg in $pkgCodes; do
+    pkgscript=${PKG_DIR}/${pkg}/ccs
+    if [ -f "$pkgscript" ]; then
+        ${pkgscript} "${step}" "${keywords}" "${pkglist}"
+
+        # exit with the most severe exit code of subsidiary package scripts
+        case "$?" in
+            $FAIL) returnCode=$FAIL ;;
+            $WARN) [ "$returnCode" -eq "$OK" ] && returnCode=$WARN ;;
+        esac
+    fi
+done
     
 case "$step" in
         POST_EXPORT) PostExport ;;
@@ -104,5 +120,5 @@ case "$step" in
         POST_UNEXPORT) PostUnexport ;;
 esac
 
-exit $ccs_return_value
+exit $returnCode
 
diff --git a/packaging/Caldera/OpenServer/pkg/input/Samba.cmpnt b/packaging/Caldera/OpenServer/pkg/input/Samba.cmpnt
index 245f6d12ce8..f1db1fde038 100644
--- a/packaging/Caldera/OpenServer/pkg/input/Samba.cmpnt
+++ b/packaging/Caldera/OpenServer/pkg/input/Samba.cmpnt
@@ -1,13 +1,17 @@
 
-COMP:SKUNK2000:Samba:
-description        = "Samba - A Windows SMB/CIFS fileserver for UNIX"
-version            = 2.2
+COMP:SCO:Samba:
+description        = $Samba_NAME
+version            = $Samba_VER
 subpackages        = Samba
+subpackages        = SambaSWAT
+subpackages        = SambaDOC
 required           = Samba
 dependencies       = 
 distTreeRootSHARED = $Samba_DIR
 distTreeRootCLIENT = $Samba_DIR
 pkgFiles           = $Samba_DIR/input/Samba.pkg
+pkgFiles           = $Samba_DIR/input/SambaSWAT.pkg
+pkgFiles           = $Samba_DIR/input/SambaDOC.pkg
 
 FILE_DEFAULT:
 mode  = $DEFAULT_FILE_MODE
diff --git a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
index ea76e74a610..f4a72dac36c 100644
--- a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
+++ b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
@@ -17,1889 +17,510 @@ owner = root
 group = sys
 flags = 
 
-PKG:Samba:
-description        = "Samba - A Windows SMB/CIFS fileserver for UNIX"
-dependencies       = 
-distTreeRootSHARED = $Samba_DIR
-distTreeRootCLIENT = $Samba_DIR
-
-DIR:Samba:SHARED:etc:
+FILE:Control:SHARED:cntl/cqs:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-DIR:Samba:SHARED:etc/init.d:
+DIR:Control:SHARED:cntl/packages:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:etc/init.d/samba:
+DIR:Control:SHARED:cntl/packages/SambaDOC:
 mode  = 0755
 owner = root
 group = sys
 flags = 
-exportPath = /etc/init.d/samba
-
-FILE:Samba:SHARED:etc/smbusers:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-exportPath = /etc/smbusers
 
-DIR:Samba:SHARED:usr:
+FILE:Control:SHARED:cntl/packages/SambaDOC/ccs:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-DIR:Samba:SHARED:usr/local:
-mode  = 0755
-owner = root
-group = sys
-flags = 
+PKG:Samba:
+description        = "Samba"
+dependencies       = 
+distTreeRootSHARED = $Samba_DIR
+distTreeRootCLIENT = $Samba_DIR
 
-DIR:Samba:SHARED:usr/local/samba:
+DIR:Samba:SHARED:etc:
 mode  = 0755
 owner = root
 group = sys
 flags = 
-exportPath = /usr/local/samba
 
-DIR:Samba:SHARED:usr/local/samba/bin:
+DIR:Samba:SHARED:etc/init.d:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/bin/nmblookup:
+FILE:Samba:SHARED:etc/init.d/samba:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /etc/init.d/samba
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbclient:
+DIR:Samba:SHARED:usr:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbpasswd:
+DIR:Samba:SHARED:usr/lib:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbstatus:
+DIR:Samba:SHARED:usr/lib/mkdev:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/bin/testparm:
+FILE:Samba:SHARED:usr/lib/mkdev/samba:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/mkdev/samba
 
-FILE:Samba:SHARED:usr/local/samba/bin/testprns:
+DIR:Samba:SHARED:usr/lib/samba:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/bin/make_smbcodepage:
+DIR:Samba:SHARED:usr/lib/samba/bin:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/bin/make_unicodemap:
+FILE:Samba:SHARED:usr/lib/samba/bin/initconfig:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/initconfig
 
-FILE:Samba:SHARED:usr/local/samba/bin/make_printerdef:
+FILE:Samba:SHARED:usr/lib/samba/bin/nmblookup:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/nmblookup
 
-FILE:Samba:SHARED:usr/local/samba/bin/rpcclient:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbclient:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbclient
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbspool:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbpasswd:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbpasswd
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbsh:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbstatus:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbstatus
 
-FILE:Samba:SHARED:usr/local/samba/bin/mksmbpasswd.sh:
+FILE:Samba:SHARED:usr/lib/samba/bin/testparm:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/testparm
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbtar:
+FILE:Samba:SHARED:usr/lib/samba/bin/testprns:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/testprns
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbprint:
+FILE:Samba:SHARED:usr/lib/samba/bin/make_smbcodepage:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/make_smbcodepage
 
-FILE:Samba:SHARED:usr/local/samba/bin/findsmb:
+FILE:Samba:SHARED:usr/lib/samba/bin/make_unicodemap:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/make_unicodemap
 
-FILE:Samba:SHARED:usr/local/samba/bin/smbadduser:
+FILE:Samba:SHARED:usr/lib/samba/bin/make_printerdef:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/make_printerdef
 
-DIR:Samba:SHARED:usr/local/samba/sbin:
+FILE:Samba:SHARED:usr/lib/samba/bin/rpcclient:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/rpcclient
 
-FILE:Samba:SHARED:usr/local/samba/sbin/smbd:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbspool:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbspool
 
-FILE:Samba:SHARED:usr/local/samba/sbin/nmbd:
+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/local/samba/sbin/swat:
+FILE:Samba:SHARED:usr/lib/samba/bin/mksmbpasswd.sh:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/mksmbpasswd.sh
 
-FILE:Samba:SHARED:usr/local/samba/sbin/debug2html:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbtar:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbtar
 
-FILE:Samba:SHARED:usr/local/samba/sbin/smbtorture:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbprint:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbprint
 
-FILE:Samba:SHARED:usr/local/samba/sbin/smbfilter:
+FILE:Samba:SHARED:usr/lib/samba/bin/findsmb:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/findsmb
 
-FILE:Samba:SHARED:usr/local/samba/sbin/locktest2:
+FILE:Samba:SHARED:usr/lib/samba/bin/smbadduser:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/bin/smbadduser
 
-FILE:Samba:SHARED:usr/local/samba/sbin/masktest:
+DIR:Samba:SHARED:usr/lib/samba/sbin:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-DIR:Samba:SHARED:usr/local/samba/swat:
+FILE:Samba:SHARED:usr/lib/samba/sbin/smbd:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/sbin/smbd
 
-DIR:Samba:SHARED:usr/local/samba/swat/using_samba:
+FILE:Samba:SHARED:usr/lib/samba/sbin/nmbd:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/sbin/nmbd
 
-DIR:Samba:SHARED:usr/local/samba/swat/using_samba/gifs:
+FILE:Samba:SHARED:usr/lib/samba/sbin/debug2html:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/sbin/debug2html
 
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/gifs/index.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/gifs/samba.s.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/gifs/txthome.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/gifs/txtnexta.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/gifs/txtpreva.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/swat/using_samba/figs:
+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/local/samba/swat/using_samba/figs/sam.0101.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0102.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0103.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0104.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0105.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0106.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0107.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0108.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0109.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0110.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0111.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0112.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0113.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0114.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0201.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0202.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0203.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0204.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0301.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0302.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0303.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0304.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0305.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0306.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0307.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0308.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0309.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0310.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0311.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0312.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0313.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0314.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0315.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0316.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0317.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0318.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0319.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0320.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0321.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0322.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0323.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0324.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0325.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0326.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0327.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0328.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0401.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0402.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0403.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0404.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0405.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0406.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0407.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0501.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0502.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0503.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0504.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0505.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0506.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0507.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0508.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0601.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0602.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0603.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0604.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0605.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0606.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0701.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0702.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0703.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0704.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0705.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0706.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0707.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0708.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0709.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0801.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0802.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0803.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0804.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0805.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0901.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0902.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0903.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0904.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.0905.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.aa01.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.ab01.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/figs/sam.ab02.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appa_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appa_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appa_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appa_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appa_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appb_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appb_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appb_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appc_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appd_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appe_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/appf_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_06.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_07.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch01_08.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch02_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch02_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch02_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch02_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch02_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch02_06.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch03_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch03_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch03_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_06.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_07.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch04_08.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch05_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch05_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch05_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch05_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch05_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch06_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch06_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch06_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch06_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch06_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch06_06.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch07_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch07_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch07_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_04.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_05.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_06.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch08_07.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch09_01.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch09_02.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/ch09_03.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/index.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/inx.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/licenseinfo.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/using_samba/this_edition.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/swat/images:
+FILE:Samba:SHARED:usr/lib/samba/sbin/smbfilter:
 mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/sbin/smbfilter
 
-FILE:Samba:SHARED:usr/local/samba/swat/images/globals.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/home.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/passwd.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/printers.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/samba.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/shares.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/status.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/images/viewconfig.gif:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/swat/help:
+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/local/samba/swat/help/welcome.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/DOMAIN_MEMBER.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/NT_Security.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/OS2-Client-HOWTO.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/Samba-HOWTO-Collection.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/UNIX_INSTALL.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/findsmb.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/lmhosts.5.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/make_smbcodepage.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/msdfs_setup.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/nmbd.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/nmblookup.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/printer_driver2.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/rpcclient.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/samba-pdc-faq.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/samba-pdc-howto.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/samba.7.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smb.conf.5.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbcacls.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbclient.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbcontrol.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbd.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbmnt.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbmount.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbpasswd.5.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbpasswd.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbrun.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbsh.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbspool.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbstatus.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbtar.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/smbumount.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/swat.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/testparm.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/testprns.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/wbinfo.1.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/winbind.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/help/winbindd.8.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/swat/include:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/include/footer.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/include/header.html:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/swat/README:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/man:
+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/local/samba/man/man.1:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/findsmb.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/make_smbcodepage.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/make_unicodemap.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/nmblookup.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/rpcclient.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbcacls.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbclient.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbcontrol.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbrun.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbsh.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbstatus.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/smbtar.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/testparm.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/testprns.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.1/wbinfo.1:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/man/man.5:
+DIR:Samba:SHARED:usr/lib/samba/lib:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/man/man.5/smb.conf.5:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.5/lmhosts.5:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.5/smbpasswd.5:
+FILE:Samba:SHARED:etc/samba.d/smb.conf.default:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /etc/samba.d/smb.conf.default
 
-DIR:Samba:SHARED:usr/local/samba/man/man.7:
+DIR:Samba:SHARED:usr/lib/samba/lib/codepages:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/man/man.7/samba.7:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/man/man.8:
+DIR:Samba:SHARED:usr/lib/samba/lib/codepages/src:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/man/man.8/smbd.8:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.8/nmbd.8:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.8/smbpasswd.8:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.8/swat.8:
-mode  = 0644
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/man/man.8/smbmount.8:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.437:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.437
 
-FILE:Samba:SHARED:usr/local/samba/man/man.8/smbmnt.8:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.737:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.737
 
-FILE:Samba:SHARED:usr/local/samba/man/man.8/smbumount.8:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.775:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.775
 
-DIR:Samba:SHARED:usr/local/samba/var:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/var/locks:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/lib:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/lib/codepages:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-DIR:Samba:SHARED:usr/local/samba/lib/codepages/src:
-mode  = 0755
-owner = root
-group = sys
-flags = 
-
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.437:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.850:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.850
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.737:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.852:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.852
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.775:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.861:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.861
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.850:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.866:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.866
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.852:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.932:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.932
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.861:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.936:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.936
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.866:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.949:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.949
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.932:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.950:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.950
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.936:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/codepage_def.1251:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/codepage_def.1251
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.949:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP437.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP437.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.950:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP737.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP737.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/codepage_def.1251:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP850.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP850.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP437.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP852.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP852.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP737.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP861.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP861.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP850.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP866.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP866.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP852.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP932.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP932.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP861.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP936.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP936.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP866.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP949.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP949.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP932.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CP950.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CP950.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP936.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CPISO8859-1.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CPISO8859-1.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP949.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CPISO8859-2.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CPISO8859-2.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CP950.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CPISO8859-5.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CPISO8859-5.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CPISO8859-1.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CPISO8859-7.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CPISO8859-7.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CPISO8859-2.TXT:
+FILE:Samba:SHARED:usr/lib/samba/lib/codepages/src/CPKOI8-R.TXT:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /usr/lib/samba/lib/codepages/src/CPKOI8-R.TXT
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CPISO8859-5.TXT:
+FILE:Samba:CLIENT:etc/samba.d/smbusers:
 mode  = 0644
 owner = root
 group = sys
 flags = 
+exportPath = /etc/samba.d/smbusers
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CPISO8859-7.TXT:
-mode  = 0644
+DIR:Samba:CLIENT:usr/lib/samba/var:
+mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:usr/local/samba/lib/codepages/src/CPKOI8-R.TXT:
-mode  = 0644
+DIR:Samba:CLIENT:usr/lib/samba/var/log:
+mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /var/log/samba.d
 
-FILE:Samba:SHARED:usr/local/samba/lib/smb.conf:
-mode  = 0644
+DIR:Samba:CLIENT:usr/lib/samba/var/locks:
+mode  = 0755
 owner = root
 group = sys
 flags = 
+exportPath = /var/locks/samba
diff --git a/packaging/Caldera/OpenServer/pkg/input/Samba.prd b/packaging/Caldera/OpenServer/pkg/input/Samba.prd
index e31c8bfe8e8..296a21624bd 100644
--- a/packaging/Caldera/OpenServer/pkg/input/Samba.prd
+++ b/packaging/Caldera/OpenServer/pkg/input/Samba.prd
@@ -1,6 +1,5 @@
-PROD:SKUNK2000:Samba:
-description = "Samba - A Windows SMB/CIFS fileserver for UNIX"
-version     = 2.2
-packages    = SKUNK2000:Samba
-required    = SKUNK2000:Samba
+PROD:SCO:Samba:
+description = $Samba_NAME
+version     = $Samba_VER
+packages    = SCO:Samba::$Samba_VER
 cmpntFiles  = Samba.cmpnt
diff --git a/packaging/Caldera/OpenServer/smb.conf b/packaging/Caldera/OpenServer/smb.conf
index 717c4efb174..1dab1e54dfb 100644
--- a/packaging/Caldera/OpenServer/smb.conf
+++ b/packaging/Caldera/OpenServer/smb.conf
@@ -15,7 +15,10 @@
 [global]
 
 # workgroup = NT-Domain-Name or Workgroup-Name
-   workgroup = MYGROUP
+   workgroup = %%WORKGROUP%%
+
+# netbios name
+   netbios name = %%NBNAME%%
 
 # server string is the equivalent of the NT Description field
    server string = Samba Server
@@ -43,16 +46,16 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   log file = /usr/local/samba/var/log.%m
+   log file = /usr/lib/samba/var/log.%m
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
 
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
-   security = user
+   security = %%SECURITY%%
 # Use password server option only with security = server
-;   password server = <NT-Server-Name>
+;   password server = %%PWSERVER%%
 
 # Password Level allows matching of _n_ characters of the password for
 # all combinations of upper and lower case.
@@ -90,7 +93,7 @@
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them
 # here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+;   interfaces = %%INTERFACES%%
 
 # Configure remote browse list synchronisation here
 #  request announcement to, or browse list sync from:
@@ -106,12 +109,12 @@
 
 # OS Level determines the precedence of this server in master browser
 # elections. The default value should be reasonable
-;   os level = 33
+   os level = %%OSLEVEL%%
 
 # Domain Master specifies Samba to be the Domain Master Browser. This
 # allows Samba to collate browse lists between subnets. Don't use this
 # if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
+   domain master = %%DOMAINMASTER%%
 
 # Preferred Master causes Samba to force a local browser election on startup
 # and gives it a slightly higher chance of winning the election
@@ -119,11 +122,11 @@
 
 # Use only if you have an NT server on your network that has been
 # configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
+;   domain controller = %%PDC%%
 
 # Enable this if you want Samba to be a domain logon server for 
 # Windows95 workstations. 
-;   domain logons = yes
+    domain logons = %%DOMAINLOGONS%%
 
 # if you enable domain logons then you may want a per-machine or
 # per user logon script
@@ -152,11 +155,11 @@
 
 # Windows Internet Name Serving Support Section:
 # WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
+;   wins support = %%WINSSUPPORT%%
 
 # WINS Server - Tells the NMBD components of Samba to be a WINS Client
 #	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
+;   wins server = %%WINSSERVER%%
 
 # WINS Proxy - Tells Samba to answer name resolution queries on
 # behalf of a non WINS capable client, for this to work there must be
diff --git a/packaging/Caldera/UnixWare/findsmb b/packaging/Caldera/UnixWare/findsmb
index bb91c784b89..4871b24ea4b 100755
--- a/packaging/Caldera/UnixWare/findsmb
+++ b/packaging/Caldera/UnixWare/findsmb
@@ -63,8 +63,17 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 
 # get the first <00> name
 
-  @name = grep(/<00>/,@nmblookup);
+  @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) = 
@@ -79,7 +88,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;
@@ -95,7 +104,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)