Added Mandrake supplied packaging patches.

Jeremy.

2 files changed, 16 insertions, 11 deletions

diff --git a/packaging/Mandrake/smb.conf b/packaging/Mandrake/smb.conf
index 69a886602be..3f6e7e02c9e 100644
--- a/packaging/Mandrake/smb.conf
+++ b/packaging/Mandrake/smb.conf
@@ -26,6 +26,10 @@
 # server string is the equivalent of the NT Description field
    server string = Samba Server %v
 
+# Message command is run by samba when a "popup" message is sent to it.
+# The example below is for use with LinPopUp:
+; message command = /usr/bin/linpopup "%f" "%m" %s; rm %s
+
 # 2. Printing Options:
 # CHANGES TO ENABLE PRINTING ON ALL CUPS PRINTERS IN THE NETWORK
 # (as cups is now used in linux-mandrake 7.2 by default)
@@ -78,6 +82,7 @@
 # Use password server option only with security = server or security = domain
 # When using security = domain, you should use password server = *
 ;   password server = <NT-Server-Name>
+;   password server = *
 
 # Password Level allows matching of _n_ characters of the password for
 # all combinations of upper and lower case.
@@ -129,7 +134,7 @@
 #
 # template homedir determines the home directory for winbind users, with 
 # %D expanding to their domain name and %U expanding to their username:
-;  temaplate homedir = /home/%D/%U
+;  template homedir = /home/%D/%U
 #
 # template shell determines the shell users authenticated by winbind get
 ;  template shell = /bin/bash
@@ -275,7 +280,6 @@
 ;   path = /var/lib/samba/netlogon
 ;   guest ok = yes
 ;   writable = no
-;   share modes = no
 
 #Uncomment the following 2 lines if you would like your login scripts to
 #be created dynamically by ntlogon (check that you have it in the correct
@@ -312,8 +316,10 @@
 # =====================================
    print command = lpr-cups -P %p -o raw %s -r   # using client side printer drivers.
 ;   print command = lpr-cups -P %p %s # using cups own drivers (use generic PostScript on clients).
-   lpq command = lpstat -o %p
-   lprm command = cancel %p-%j
+# The following two commands are the samba defaults for printing=cups
+# change them only if you need different options:
+;   lpq command = lpq -P %p
+;   lprm command = cancel %p-%j
 
 # This share is used for Windows NT-style point-and-print support.
 # To be able to install drivers, you need to be either root, or listed
@@ -321,12 +327,11 @@
 # to the directory and share definition to be able to upload the drivers.
 # For more information on this, please see the Printing Support Section of
 # /usr/share/doc/samba-<version>/docs/Samba-HOWTO-Collection.pdf 
-# Please note that this has not yet been tested as packaged here with CUPS.
-;[print$]
-;   path = /var/lib/samba/printers
-;   browseable = yes
-;   read only = yes
-;   write list = @adm root
+[print$]
+   path = /var/lib/samba/printers
+   browseable = yes
+   read only = yes
+   write list = @adm root
 
 # This one is useful for people to share files
 ;[tmp]
diff --git a/packaging/Mandrake/system-auth-winbind.pamd b/packaging/Mandrake/system-auth-winbind.pamd
index 79e43be57d8..af859af72b2 100644
--- a/packaging/Mandrake/system-auth-winbind.pamd
+++ b/packaging/Mandrake/system-auth-winbind.pamd
@@ -5,7 +5,7 @@ auth        sufficient    /lib/security/pam_winbind.so
 auth        sufficient    /lib/security/pam_unix.so likeauth nullok use_first_pass
 auth        required      /lib/security/pam_deny.so
 
-account     sufficient    /lib/secutiry/pam_winbind.so
+account     sufficient    /lib/security/pam_winbind.so
 account     required      /lib/security/pam_unix.so
 
 password    required      /lib/security/pam_cracklib.so retry=3