final sync with SAMBA_2_2

(This used to be commit a25f6694d230fe384c212350dacf17bfae3ab79d)

5 files changed, 10 insertions, 11 deletions

diff --git a/packaging/SGI/findsmb b/packaging/SGI/findsmb
index c10efbf22a..a48ec592e8 100755
--- a/packaging/SGI/findsmb
+++ b/packaging/SGI/findsmb
@@ -63,7 +63,7 @@ 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 ($_) {                     # we have a netbios name
     if (/GROUP/) {		# is it a group name
diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl
index cdbddcb590..ba05149509 100755
--- a/packaging/SGI/idb.pl
+++ b/packaging/SGI/idb.pl
@@ -101,6 +101,7 @@ chdir $curdir;
 # the "*.doc" files from the source tree
 @docs = sort byfilename grep (!/^docs\/$/ & (/^source\/.*\.doc$/ | /^docs\//),@allfiles);
 @docs = grep(!/htmldocs\/using_samba/, @docs);
+@docs = grep(!/docbook/, @docs);
 
 @swatfiles = sort grep(/^packaging\/SGI\/swat/, @allfiles);
 @catman = sort grep(/^packaging\/SGI\/catman/ & !/\/$/, @allfiles);
diff --git a/packaging/SGI/mkrelease.sh b/packaging/SGI/mkrelease.sh
index 19aa642aad..6eab242de8 100755
--- a/packaging/SGI/mkrelease.sh
+++ b/packaging/SGI/mkrelease.sh
@@ -67,7 +67,7 @@ fi
 cd ../../source
 if [ "$doclean" = "clean" ]; then
   echo Create SGI specific Makefile
-  ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-smbwrapper
+  ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-acl-support --with-smbwrapper
   errstat=$?
   if [ $errstat -ne 0 ]; then
     echo "Error $errstat creating Makefile\n";
diff --git a/packaging/SGI/smb.conf b/packaging/SGI/smb.conf
index 5172949cfc..58d5e6e542 100644
--- a/packaging/SGI/smb.conf
+++ b/packaging/SGI/smb.conf
@@ -96,18 +96,16 @@
    browseable = no
    writeable = yes
 
-; To allow Win95 clients to automatically load printer drivers, uncomment
-; the following section (and the lines in the printers section below).
-; Run the make_printerdef command to create the /usr/samba/lib/printers.def
-; file (see the PRINTER_DRIVER.txt file in the docs directory for info).
-; Copy all the required files to the /usr/samba/printer directory
+; Use the new NT style printer download setup.
+; See the file PRINTER_DRIVER2.txt in the docs directory for info.
 ;
-;[printer$]
+;[print$]
 ;   comment = printer driver directory
 ;   path = /usr/samba/printer
 ;   guest ok = yes
-;   writeable = no
-;   browseable = no
+;   browseable = yes
+;   read only = yes
+;   write list = ntadmin
 
 [printers]
    comment = All Printers
diff --git a/packaging/SGI/smbprint b/packaging/SGI/smbprint
index 0db8b6f7e3..07923a42b1 100644
--- a/packaging/SGI/smbprint
+++ b/packaging/SGI/smbprint
@@ -49,6 +49,6 @@ password=""
 	echo translate
 	echo "print -"
 	cat $*
-) | /usr/samba/bin/smbclient "\\\\$server\\$service" $password -N -P  > /dev/null
+) | /usr/samba/bin/smbclient "//$server/$service" $password -N  > /dev/null
 exit $?