From 054e5daf7c362b55310d9159ac90732f6ee5f7e0 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 29 Mar 2003 12:49:54 +0000
Subject: sync packagaing with SAMBA_3_0 (This used to be commit
 b97f6620aa80df9649775f81055b70146a03ec66)

---
 packaging/Mandrake/smb.conf | 47 ++++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 16 deletions(-)

(limited to 'packaging/Mandrake/smb.conf')

diff --git a/packaging/Mandrake/smb.conf b/packaging/Mandrake/smb.conf
index f68d48cb4b..f2643b774a 100644
--- a/packaging/Mandrake/smb.conf
+++ b/packaging/Mandrake/smb.conf
@@ -77,6 +77,8 @@
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
 # otherwise the user "nobody" is used
 ;  guest account = pcguest
+# Allow users to map to guest:
+  map to guest = bad user
 
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
@@ -212,27 +214,39 @@
 ; logon home = \\%L\%U\.profile
 
 # The add user script is used by a domain member to add local user accounts
-# that have been authenticated by the domain controller, or by the domain
+# that have been authenticated by the domain controller.
+# Script for domain member for adding local accounts for authenticated users:
+; add user script = /usr/sbin/useradd -s /bin/false %u
+
+# The add machine script is use by a samba server configured as a domain
 # controller to add local machine accounts when adding machines to the domain.
 # The script must work from the command line when replacing the macros,
 # or the operation will fail. Check that groups exist if forcing a group.
 # Script for domain controller for adding machines:
-; add user script = /usr/sbin/useradd -d /dev/null -g machines -c 'Machine Account' -s /bin/false -M %u
+; add machine script = /usr/sbin/useradd -d /dev/null -g machines -c 'Machine Account' -s /bin/false -M %u
 # Script for domain controller with LDAP backend for adding machines (please
 # configure in /etc/samba/smbldap_conf.pm first):
-; add user script = /usr/share/samba/scripts/smbldap-useradd.pl -w -d /dev/null -g machines -c 'Machine Account' -s /bin/false %u
-# Script for domain member for adding local accounts for authenticated users:
-; add user script = /usr/sbin/useradd -s /bin/false %u
+; add machine script = /usr/share/samba/scripts/smbldap-useradd.pl -w -d /dev/null -g machines -c 'Machine Account' -s /bin/false %u
 
 # Domain groups:
-# domain admin group is a list of unix users or groups who are made members
-# of the Domain Admin group
-; domain admin group = root @wheel
-#
-# domain guest groups is a list of unix users or groups who are made members
-# of the Domain Guests group
-; domain guest group = nobody @guest
-
+# Domain groups are now configured by using the smbgroupedit tool
+
+# Samba Password Database configuration:
+# Samba now has runtime-configurable password database backends. Multiple
+# passdb backends may be used, but users will only be added to the first one
+# Default:
+; passdb backend = smbpasswd unixsam
+# TDB backen with fallback to smbpasswd and unixsam
+; passdb backend = tdbsam_nua smbpasswd unixsam
+# LDAP with fallback to smbpasswd unixsam
+# Enable SSL by using an ldaps url, or enable tls with 'ldap ssl' below.
+; passdb backend = ldapsam_nua:ldaps://ldap.mydomain.com smbpasswd unixsam
+
+# Non-unix account range:
+# This is a range of unix user-id's that samba will map non-unix RIDs to,
+# such as machine accounts, when using a _nua passdb backend
+ non unix account range = 10000-20000
+  
 # LDAP configuration for Domain Controlling:
 # The account (dn) that samba uses to access the LDAP server
 # This account needs to have write access to the LDAP tree
@@ -297,8 +311,8 @@
 # UNIX: ISO8859-1 (Western European), ISO8859-2 (Eastern Eu.),
 # ISO8859-5 (Russian Cyrillic), KOI8-R (Alt-Russ. Cyril.)
 # This is an example for french users:
-;   client code page = 850
-;   character set = ISO8859-1
+;   dos charset = 850
+;   unix charset = ISO8859-1
 
 
 #============================ Share Definitions ==============================
@@ -372,6 +386,7 @@
    browseable = yes
    read only = yes
    write list = @adm root
+   guest ok = yes
 
 # A useful application of samba is to make a PDF-generation service
 # To streamline this, install windows postscript drivers (preferably colour)
@@ -383,7 +398,7 @@
    printable = Yes
    comment = PDF Generator (only valid users)
    #print command = /usr/share/samba/scripts/print-pdf file path win_path recipient IP &
-   print command = /usr/share/samba/scripts/print-pdf %s ~%u \\\\\\\\%L\\\\%u %m %I &
+   print command = /usr/share/samba/scripts/print-pdf %s ~%u //%L/%u %m %I "%J" &
 
 # This one is useful for people to share files
 ;[tmp]
-- 
cgit