merge from 2.2 branch

(This used to be commit 692c23fe86391204161adeb6cf9b8061d0121175)

2 files changed, 61 insertions, 26 deletions

diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl
index ba051495091..b37e46c4ec0 100755
--- a/packaging/SGI/idb.pl
+++ b/packaging/SGI/idb.pl
@@ -36,6 +36,10 @@ close IGNORES;
 # get the names of all the binary files to be installed
 open(MAKEFILE,"$SRCDIR/source/Makefile") || die "Unable to open Makefile\n";
 @makefile = <MAKEFILE>;
+@winbind_progs = grep(/^WINBIND_PROGS /,@makefile);
+@winbind_sprogs = grep(/^WINBIND_SPROGS /,@makefile);
+@winbind_lprogs = grep(/^WINBIND_LPROGS /,@makefile);
+@winbind_pam_progs = grep(/^WINBIND_PAM_PROGS /,@makefile);
 @sprogs = grep(/^SPROGS /,@makefile);
 @progs1 = grep(/^PROGS1 /,@makefile);
 @progs2 = grep(/^PROGS2 /,@makefile);
@@ -45,8 +49,25 @@ open(MAKEFILE,"$SRCDIR/source/Makefile") || die "Unable to open Makefile\n";
 @codepagelist = grep(/^CODEPAGELIST/,@makefile);
 close MAKEFILE;
 
+if (@winbind_progs) {
+  @winbind_progs[0] =~ s/^.*\=//;
+  @winbind_progs = split(' ',@winbind_progs[0]);
+}
+if (@winbind_sprogs) {
+  @winbind_sprogs[0] =~ s/^.*\=//;
+  @winbind_sprogs = split(' ',@winbind_sprogs[0]);
+}
+if (@winbind_lprogs) {
+  @winbind_lprogs[0] =~ s/^.*\=//;
+  @winbind_lprogs = split(' ',@winbind_lprogs[0]);
+}
+if (@winbind_pam_progs) {
+  @winbind_pam_progs[0] =~ s/^.*\=//;
+  @winbind_pam_progs = split(' ',@winbind_pam_progs[0]);
+}
 if (@sprogs) {
   @sprogs[0] =~ s/^.*\=//;
+  @sprogs[0] =~ s/\$\(\S+\)\s//g;
   @sprogs = split(' ',@sprogs[0]);
 }
 if (@progs) {
@@ -90,7 +111,8 @@ system("cp -f ../swat/README ../packaging/SGI/swat");
 chdir $curdir;
 
 # add my local files to the list of binaries to install
-@bins = sort byfilename (@sprogs,@progs,@progs1,@progs2,@mprogs,@scripts,("/findsmb","/sambalp","/smbprint"));
+@bins = sort byfilename (@sprogs,@progs,@progs1,@progs2,@mprogs,@scripts,@winbind_progs,@winbind_sprogs,("/findsmb","/sambalp","/smbprint"));
+@nsswitch = sort byfilename (@winbind_lprogs,@winbind_pam_progs);
 
 # get a complete list of all files in the tree
 chdir "$SRCDIR/";
@@ -156,6 +178,15 @@ while(@bins) {
     elsif ($filename eq "smbprint") {
       print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base\n";
     }
+    elsif ($filename eq "smbd") {
+      print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
+      print IDB "f 0755 root sys usr/samba/bin/$filename.noquota $SRCPFX/source/$nextfile.noquota $PKG.sw.base \n";
+      print IDB "f 0755 root sys usr/samba/bin/$filename.profile $SRCPFX/source/$nextfile.profile $PKG.sw.base \n";
+    }
+    elsif ($filename eq "nmbd") {
+      print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
+      print IDB "f 0755 root sys usr/samba/bin/$filename.profile $SRCPFX/source/$nextfile.profile $PKG.sw.base \n";
+    }
     else {
       print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
     }
@@ -185,6 +216,22 @@ while (@codepage) {
 }
 print IDB "f 0644 root sys usr/samba/lib/smb.conf $SRCPFX/packaging/SGI/smb.conf $PKG.sw.base config(suggest)\n";
 
+if (@nsswitch) {
+  print IDB "d 0644 root sys usr/samba/nsswitch $SRCPFX/packaging/SGI $PKG.sw.base\n";
+  while(@nsswitch) {
+    $nextfile = shift @nsswitch;
+    ($filename = $nextfile) =~ s/^.*\///;;
+    print IDB "f 0755 root sys usr/samba/nsswitch/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n";
+  }
+}
+
+print IDB "d 0755 lp sys usr/samba/printer $SRCPFX/packaging/SGI $PKG.sw.base\n";
+print IDB "d 0755 lp sys usr/samba/printer/W32X86 $SRCPFX/packaging/SGI $PKG.sw.base\n";
+print IDB "d 0755 lp sys usr/samba/printer/WIN40 $SRCPFX/packaging/SGI $PKG.sw.base\n";
+print IDB "d 0755 lp sys usr/samba/printer/W32MIPS $SRCPFX/packaging/SGI $PKG.sw.base\n";
+print IDB "d 0755 lp sys usr/samba/printer/W32ALPHA $SRCPFX/packaging/SGI $PKG.sw.base\n";
+print IDB "d 0755 lp sys usr/samba/printer/W32PPC $SRCPFX/packaging/SGI $PKG.sw.base\n";
+
 print IDB "d 0644 root sys usr/samba/private $SRCPFX/packaging/SGI $PKG.sw.base\n";
 print IDB "f 0600 root sys usr/samba/private/smbpasswd $SRCPFX/packaging/SGI/smbpasswd $PKG.sw.base config(suggest)\n";
 
@@ -254,7 +301,7 @@ while (@catman) {
   }
   print IDB "f 0664 root sys usr/share/catman/u_man/cat$dirnum/$file $SRCPFX/$nextfile $PKG.man.manpages\n";
 }
-print IDB "d 01777 nobody nobody var/spool/samba $SRCPFX/packaging/SGI $PKG.sw.base\n";
+print IDB "d 01777 lp sys var/spool/samba $SRCPFX/packaging/SGI $PKG.sw.base\n";
 
 close IDB;
 print "\n\n$PKG.idb file has been created\n";
diff --git a/packaging/SGI/smb.conf b/packaging/SGI/smb.conf
index 58d5e6e5428..3448226faa3 100644
--- a/packaging/SGI/smb.conf
+++ b/packaging/SGI/smb.conf
@@ -58,12 +58,11 @@
 ;  Set a max size for log files in Kb
    max log size = 50
 
-;  You will need a world readable lock directory and "share modes=yes"
+;  You will need a world readable lock directory
 ;  if you want to support the file sharing modes for multiple users
 ;  of the same files
    locking = yes
    lock directory = /usr/samba/var/locks
-   share modes = yes
 
    security = user
 
@@ -91,21 +90,23 @@
 ;  Uncomment the following if you wish to sync unix and smbpasswd 
 ;   unix password sync = yes
 
+;  Printer admin account to allow uploading printer drivers
+   printer admin = lp
+
 [homes]
    comment = Home Directories
    browseable = no
    writeable = yes
 
-; Use the new NT style printer download setup.
-; See the file PRINTER_DRIVER2.txt in the docs directory for info.
+; Share for printer drivers for automatic driver download
 ;
-;[print$]
-;   comment = printer driver directory
-;   path = /usr/samba/printer
-;   guest ok = yes
-;   browseable = yes
-;   read only = yes
-;   write list = ntadmin
+[print$]
+   comment = printer driver directory
+   path = /usr/samba/printer
+   guest ok = yes
+   browseable = yes
+   read only = yes
+   write list = lp
 
 [printers]
    comment = All Printers
@@ -115,19 +116,6 @@
    guest ok = yes
    writeable = no
    create mask = 0700
-;
-; this specifies the location of the share containing the printer driver
-; files - see the printer$ section above
-;
-;   printer driver location = \\%L\printer$
-;
-; the following line will make all printers default to the QMS-PS 810 Turbo
-; driver - which works quite well for Impressario. If you need a diferent
-; driver for a specific printer, create a section for that printer and
-; specify the correct printer driver.
-;
-;   printer driver = QMS-PS 810 Turbo
-
 
 [tmp]
   comment = Temporary file space