beginning to sync up for 2.2.5 release....

17 files changed, 182 insertions, 76 deletions

diff --git a/packaging/Caldera/OpenLinux/findsmb b/packaging/Caldera/OpenLinux/findsmb
index fb178f91c1c..04bc6080508 100755
--- a/packaging/Caldera/OpenLinux/findsmb
+++ b/packaging/Caldera/OpenLinux/findsmb
@@ -63,17 +63,8 @@ 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) = 
@@ -82,13 +73,16 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+# The Netbios name can contain lot of characters also '<' '>'
+# and spaces. The follwing cure inside name space but not
+# names starting or ending with spaces
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
 # 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 +98,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)
 
@@ -112,7 +106,8 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+# Same as before for space and characters
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
index df0b6bff4d2..8af6974b58f 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-lsb.tmpl
@@ -295,10 +295,15 @@ make LOGFILEBASE=/var/log/samba.d all nsswitch/libnss_wins.so debug2html bin/smb
 
 # Now build the VFS modules
 cd ../examples/VFS
-make
+CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
+        --with-fhs \
+        --prefix='$(DESTDIR)/usr' \
+        --localstatedir='$(DESTDIR)/var' \
+        --libdir='$(DESTDIR)%{EtcSamba}'
 cd block
 mv block.c block.c.old
-sed 's/etc\/samba/etc\/samba\.d/g' < block.c.old > block.c
+sed 's/etc\/samba/etc\/samba\.d\/vfs/g' < block.c.old > block.c
+cd ..
 make
  
 
@@ -314,7 +319,7 @@ 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/samba}
+mkdir -p $DESTDIR/usr/{include,lib/samba/vfs}
 
 make LOGFILEBASE=/var/log/samba.d -C source  install
 
@@ -338,10 +343,13 @@ 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 examples/VFS/audit.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/recycle/recycle.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/recycle/recycle.conf $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/skel.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/block/block.so $DESTDIR/usr/lib/samba/vfs
+install -m 644 examples/VFS/block/samba-block.conf $DESTDIR/etc/samba.d/samba-block.conf.example
+install -m 644 examples/VFS/block/smb.conf $DESTDIR/etc/samba.d/smb.conf.example-with-block-use
 
 install -m 755 source/nsswitch/pam_winbind.so $DESTDIR/lib/security
 install -m 755 source/bin/wbinfo $DESTDIR/usr/bin
@@ -363,7 +371,6 @@ cp -p $VVS/smbadduser $DESTDIR/usr/bin/smbadduser
 #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/winbind.daemon $DESTDIR/etc/sysconfig/daemons/winbind
 cp -p $VVS/samba.pam $DESTDIR/etc/pam.d/samba
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl
index a46d4cac062..07b188d81be 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-sam.tmpl
@@ -1,4 +1,4 @@
-%define Version 	PVERSION
+%define Version 	PVERSIONsam
 %define date            PRELEASE
 %define Vendor  	Caldera
 %define Dist		OpenLinux
@@ -287,16 +287,25 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
 	--with-syslog \
 	--with-vfs \
 	--with-msdfs \
-	--with-tdbsam 
+	--with-tdbsam \
+	--with-ldapsam \
+	--with-nisplussam \
+	--with-nisplushome \
+	--with-krb5=/usr/athena
 
 make LOGFILEBASE=/var/log/samba.d everything nsswitch/libnss_wins.so
 
 # Now build the VFS modules
 cd ../examples/VFS
-make
+CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
+        --with-fhs \
+        --prefix='$(DESTDIR)/usr' \
+        --localstatedir='$(DESTDIR)/var' \
+        --libdir='$(DESTDIR)%{EtcSamba}'
 cd block
 mv block.c block.c.old
-sed 's/etc\/samba/etc\/samba\.d/g' < block.c.old > block.c
+sed 's/etc\/samba/etc\/samba\.d\/vfs/g' < block.c.old > block.c
+cd ..
 make
 
 
@@ -313,7 +322,7 @@ 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/vfs}
 
 make LOGFILEBASE=/var/log/samba.d -C source install
 
@@ -353,16 +362,18 @@ 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
+install -m 755 examples/VFS/audit.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/recycle/recycle.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/recycle/recycle.conf $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/skel.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/block/block.so $DESTDIR/usr/lib/samba/vfs
+install -m 644 examples/VFS/block/samba-block.conf $DESTDIR/etc/samba.d/samba-block.conf.example
+install -m 644 examples/VFS/block/smb.conf $DESTDIR/etc/samba.d/smb.conf.example-with-block-use
 
 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
diff --git a/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl b/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl
index b4842fc3f79..216d23e6162 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec-team.tmpl
@@ -290,10 +290,15 @@ make LOGFILEBASE=/var/log/samba.d everything nsswitch/libnss_wins.so
 
 # Now build the VFS modules
 cd ../examples/VFS
-make
+CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
+        --with-fhs \
+        --prefix='$(DESTDIR)/usr' \
+        --localstatedir='$(DESTDIR)/var' \
+        --libdir='$(DESTDIR)%{EtcSamba}'
 cd block
 mv block.c block.c.old
-sed 's/etc\/samba/etc\/samba\.d/g' < block.c.old > block.c
+sed 's/etc\/samba/etc\/samba\.d\/vfs/g' < block.c.old > block.c
+cd ..
 make
 
 
@@ -309,7 +314,7 @@ 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/samba}
+mkdir -p $DESTDIR/usr/{include,lib/samba/vfs}
 
 make LOGFILEBASE=/var/log/samba.d -C source install
 
@@ -350,16 +355,18 @@ 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
+install -m 755 examples/VFS/audit.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/recycle/recycle.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/recycle/recycle.conf $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/skel.so $DESTDIR/usr/lib/samba/vfs
+install -m 755 examples/VFS/block/block.so $DESTDIR/usr/lib/samba/vfs
+install -m 644 examples/VFS/block/samba-block.conf $DESTDIR/etc/samba.d/samba-block.conf.example
+install -m 644 examples/VFS/block/smb.conf $DESTDIR/etc/samba.d/smb.conf.example-with-block-use
 
 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
diff --git a/packaging/Caldera/OpenLinux/samba2.spec.tmpl b/packaging/Caldera/OpenLinux/samba2.spec.tmpl
index 58dad3e9b0b..9b5299867c8 100644
--- a/packaging/Caldera/OpenLinux/samba2.spec.tmpl
+++ b/packaging/Caldera/OpenLinux/samba2.spec.tmpl
@@ -333,7 +333,6 @@ cp -p $VVS/smbadduser $DESTDIR/usr/bin/smbadduser
 #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
 cp -p $VVS/samba.logrotate $DESTDIR/etc/logrotate.d/samba
diff --git a/packaging/Caldera/OpenServer/Compile b/packaging/Caldera/OpenServer/Compile
index 7628704f0d3..d3f5ed957df 100755
--- a/packaging/Caldera/OpenServer/Compile
+++ b/packaging/Caldera/OpenServer/Compile
@@ -7,10 +7,10 @@
 V=
 [ "$1" = "-n" ] && V=echo
 
-CC="gcc -I/usr/local/include -L/usr/local/lib"
-CFLAGS="-O3 -I/usr/local/include -L/usr/local/lib"
+CC="gcc"
+CFLAGS="-O3"
 CXX="g++"
-CXXFLAGS="-O3 -I/usr/local/include/stl -I/usr/local/include -L/usr/local/lib"
+CXXFLAGS="-O3"
 RANLIB=true
 MAKE=/usr/gnu/bin/make
 if [ "$V" = "echo" ]
@@ -33,12 +33,21 @@ then
     echo "make all 2>&1 | tee mout-1"
     echo "make smbfilter debug2html 2>&1 | tee mout-2"
     echo "make bin/smbspool bin/wbinfo 2>&1 | tee mout-3"
+    echo "cd ../examples/VFS"
+    echo "rm -f mout-1"
+    echo "gmake 2>&1 | tee mout-1"
+    echo "cd block"
+    echo "rm -f mout-1"
+    echo "gmake 2>&1 | tee mout-1"
 else
     cd ../../../source
     rm -f mout-1 mout-2 mout-3 mout-4
     make all 2>&1 | tee mout-1
     make smbfilter debug2html 2>&1 | tee mout-2
     make bin/smbspool bin/wbinfo 2>&1 | tee mout-3
+    cd ../examples/VFS
+    rm -f mout-1
+    gmake 2>&1 | tee mout-1
 fi
 #
 # Not building :
diff --git a/packaging/Caldera/OpenServer/Configure b/packaging/Caldera/OpenServer/Configure
index 9e303c1dd2e..0c63f7ff5b4 100755
--- a/packaging/Caldera/OpenServer/Configure
+++ b/packaging/Caldera/OpenServer/Configure
@@ -7,10 +7,11 @@
 V=
 [ "$1" = "-n" ] && V=echo
 
-CC="gcc -I/usr/local/include -L/usr/local/lib"
-CFLAGS="-O3 -I/usr/local/include -L/usr/local/lib"
+CC="gcc"
+CFLAGS="-O3"
 CXX="g++"
-CXXFLAGS="-O3 -I/usr/local/include/stl -I/usr/local/include -L/usr/local/lib"
+#CXXFLAGS="-O3 -I/usr/local/include/stl -I/usr/local/include -L/usr/local/lib"
+CXXFLAGS="-O3"
 RANLIB=true
 MAKE=/usr/gnu/bin/make
 PREFIX=/usr/lib/samba
@@ -54,6 +55,7 @@ then
 	--with-utmp \
 	--with-vfs \
 	--with-msdfs \
+	--with-readline=/usr \
 	--with-sambabook=${PREFIX}/swat/using_samba \
         2>&1 | tee mout-config"
 else
@@ -68,6 +70,7 @@ else
 	--with-utmp \
 	--with-vfs \
 	--with-msdfs \
+	--with-readline=/usr \
 	--with-sambabook=${PREFIX}/swat/using_samba \
         2>&1 | tee mout-config
 fi
@@ -81,3 +84,19 @@ EOF
 sed -e "s/nobody/nouser/" include/local.h > /tmp/nouser$$
 cp /tmp/nouser$$ include/local.h
 rm -f /tmp/nouser$$
+
+cd ../examples/VFS
+[ -f mout-config ] && {
+    if [ "$V" = "echo" ]
+    then
+        echo "mv mout-config mout-config$$"
+    else
+        mv mout-config mout-config$$
+    fi
+}
+if [ "$V" = "echo" ]
+then
+    echo "./configure 2>&1 | tee mout-config"
+else
+    ./configure 2>&1 | tee mout-config
+fi
diff --git a/packaging/Caldera/OpenServer/Install b/packaging/Caldera/OpenServer/Install
index 8fc79bcac5c..67ea438cd0c 100755
--- a/packaging/Caldera/OpenServer/Install
+++ b/packaging/Caldera/OpenServer/Install
@@ -67,6 +67,11 @@ do
 $V    install -m755 -s source/bin/$i ${BLDFIX}/sbin
 done
 
+# Install VFS libraries
+$V install -m644 -s examples/VFS/block/block.so ${BLDFIX}/lib
+$V install -m644 -s examples/VFS/audit.so ${BLDFIX}/lib
+$V install -m644 -s examples/VFS/recycle/recycle.so ${BLDFIX}/lib
+$V install -m644 -s examples/VFS/skel.so ${BLDFIX}/lib
 
 # Install level 1 man pages
 for i in *.1
@@ -124,6 +129,9 @@ $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 examples/VFS/recycle/recycle.conf ${BLDFIX}/lib
+$V install -m644 examples/VFS/block/samba-block.conf ${BUILD_ROOT}/etc/samba.d
+$V install -m644 ${PKGDIR}/example.block.smb.conf ${BUILD_ROOT}/etc/samba.d
 $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
@@ -137,6 +145,7 @@ $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}/samba.directory $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/example.block.smb.conf b/packaging/Caldera/OpenServer/example.block.smb.conf
new file mode 100644
index 00000000000..793fbeb52b1
--- /dev/null
+++ b/packaging/Caldera/OpenServer/example.block.smb.conf
@@ -0,0 +1,5 @@
+[homes]
+   comment = Home Directories
+   vfs object = /usr/lib/samba/lib/block.so
+   browseable = yes
+   writable = yes
diff --git a/packaging/Caldera/OpenServer/findsmb b/packaging/Caldera/OpenServer/findsmb
index 2e831c5f11a..08c5df11250 100755
--- a/packaging/Caldera/OpenServer/findsmb
+++ b/packaging/Caldera/OpenServer/findsmb
@@ -73,7 +73,10 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+# The Netbios name can contain lot of characters also '<' '>'
+# and spaces. The follwing cure inside name space but not
+# names starting or ending with spaces
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
@@ -103,7 +106,8 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+# Same as before for space and characters
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";
diff --git a/packaging/Caldera/OpenServer/pkg/cdmt.config b/packaging/Caldera/OpenServer/pkg/cdmt.config
index 9bf3f203f93..a93ac0ce18b 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.4a
+Samba_VER	= 2.2.5a
 
 DEFAULT_EXEC_MODE = 0755
 
diff --git a/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs b/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs
index ea86e009025..36b40d681d2 100755
--- a/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs
+++ b/packaging/Caldera/OpenServer/pkg/cntl/packages/SambaDOC/ccs
@@ -13,14 +13,18 @@ ccs_return_value=0
 PostExport()
 {
     if [ -x /usr/bin/doctool ]; then
-        /usr/bin/doctool --add NetworkDoc/WinConnect/samba.desktop >&- 2>&-
+        /usr/bin/doctool --add NetworkDoc/WinConnect/Samba/.directory >&- 2>&-
+        /usr/bin/doctool --add \
+            NetworkDoc/WinConnect/Samba/samba.desktop >&- 2>&-
     fi
 }
 
 PreUnexport()
 {
     if [ -x /usr/bin/doctool ]; then
-        /usr/bin/doctool --remove NetworkDoc/WinConnect/samba.desktop >&- 2>&-
+        /usr/bin/doctool --remove \
+            NetworkDoc/WinConnect/Samba/samba.desktop >&- 2>&-
+        /usr/bin/doctool --remove NetworkDoc/WinConnect/Samba/.directory >&- 2>&-
     fi
 }
     
diff --git a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
index eabf026eb4d..d2f21b8a006 100644
--- a/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
+++ b/packaging/Caldera/OpenServer/pkg/input/Samba.pkg
@@ -280,18 +280,53 @@ group = sys
 flags = 
 exportPath = /usr/lib/samba/sbin/smbfilter
 
+FILE:Samba:SHARED:etc/samba.d/smb.conf.default:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /etc/samba.d/smb.conf.default
+
+FILE:Samba:SHARED:etc/samba.d/example.block.smb.conf:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /etc/samba.d/example.block.smb.conf
+
 DIR:Samba:SHARED:usr/lib/samba/lib:
 mode  = 0755
 owner = root
 group = sys
 flags = 
 
-FILE:Samba:SHARED:etc/samba.d/smb.conf.default:
+FILE:Samba:SHARED:usr/lib/samba/lib/audit.so:
 mode  = 0644
 owner = root
 group = sys
 flags = 
-exportPath = /etc/samba.d/smb.conf.default
+exportPath = /usr/lib/samba/lib/audit.so
+
+FILE:Samba:SHARED:usr/lib/samba/lib/block.so:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/lib/samba/lib/block.so
+
+FILE:Samba:SHARED:usr/lib/samba/lib/recycle.so:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/lib/samba/lib/recycle.so
+
+FILE:Samba:SHARED:usr/lib/samba/lib/skel.so:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/lib/samba/lib/skel.so
 
 DIR:Samba:SHARED:usr/lib/samba/lib/codepages:
 mode  = 0755
diff --git a/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg b/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg
index 0ed9bdb72b8..abbd1e83f75 100644
--- a/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg
+++ b/packaging/Caldera/OpenServer/pkg/input/SambaDOC.pkg
@@ -11,12 +11,19 @@ owner = root
 group = sys
 flags = 
 
+FILE:SambaDOC:SHARED:doc/samba.directory:
+mode  = 0644
+owner = root
+group = sys
+flags = 
+exportPath = /usr/share/meta/doc/NetworkDoc/WinConnect/Samba/.directory
+
 FILE:SambaDOC:SHARED:doc/samba.desktop:
 mode  = 0644
 owner = root
 group = sys
 flags = 
-exportPath = /usr/share/meta/doc/NetworkDoc/WinConnect/samba.desktop
+exportPath = /usr/share/meta/doc/NetworkDoc/WinConnect/Samba/samba.desktop
 
 FILE:SambaDOC:SHARED:doc/index.html:
 mode  = 0644
diff --git a/packaging/Caldera/OpenServer/samba.desktop b/packaging/Caldera/OpenServer/samba.desktop
index cd34e08ac5c..33512125141 100644
--- a/packaging/Caldera/OpenServer/samba.desktop
+++ b/packaging/Caldera/OpenServer/samba.desktop
@@ -1,7 +1,4 @@
 [Desktop Entry]
-Name=Samba
+Name=Samba Documentation
 DocPath=/usr/share/doc/samba/help/index.html
-X-COL-Weight=2.0
-# listed in DocView under:
-#    Networking group (NetworkDoc)
-#    Windows Connectivity category (WinConnect)       
+X-COL-Weight=1.0
diff --git a/packaging/Caldera/OpenServer/samba.directory b/packaging/Caldera/OpenServer/samba.directory
new file mode 100644
index 00000000000..bdc6fa8af41
--- /dev/null
+++ b/packaging/Caldera/OpenServer/samba.directory
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Name=Samba File and Print Server
+Type=group
diff --git a/packaging/Caldera/UnixWare/findsmb b/packaging/Caldera/UnixWare/findsmb
index 4871b24ea4b..04bc6080508 100755
--- a/packaging/Caldera/UnixWare/findsmb
+++ b/packaging/Caldera/UnixWare/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/bin";
 
 for ($i = 0; $i < 2; $i++) {	# test for -d option and broadcast address
   $_ = shift;
@@ -63,17 +63,8 @@ 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) = 
@@ -82,13 +73,16 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
 	    $name = "unknown nis name";
 	}
     } else {
-	/(\S+)/;
+# The Netbios name can contain lot of characters also '<' '>'
+# and spaces. The follwing cure inside name space but not
+# names starting or ending with spaces
+	/(.{1,15})\s+<00>\s+/;
 	$name = $1;
     }
 
 # 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 +98,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)
 
@@ -112,7 +106,8 @@ foreach $ip (@ipaddrs)		# loop through each IP address found
       @name = grep(/<00> - <GROUP>/,@nmblookup);
       $_ = @name[0];
       if ($_) {
-        /(\S+)/;
+# Same as before for space and characters
+        /(.{1,15})\s+<00>\s+/;
         $_ = "[$1]";
       } else {
 	$_ = "Unknown Workgroup";