merging some changes from SAMBA_2_2

(This used to be commit e8ede079b5af4187573f1b8ed0d94b6f03cbbd22)

5 files changed, 183 insertions, 8 deletions

diff --git a/examples/LDAP/samba-schema-netscapeds4.x b/examples/LDAP/samba-schema-netscapeds4.x
new file mode 100644
index 0000000000..c5a11b8b66
--- /dev/null
+++ b/examples/LDAP/samba-schema-netscapeds4.x
@@ -0,0 +1,54 @@
+#
+# LDAP Schema file for SAMBA attribute storage 
+# This file is suitable for usage with Netscape Directory Server 4.1x
+# Adapted by Scott Lawson with help from Ron Creamer
+#
+
+attribute       lmPassword              1.3.6.1.4.1.7165.2.1.1  cis single
+attribute       ntPassword              1.3.6.1.4.1.7165.2.1.2  cis single
+attribute       acctFlags               1.3.6.1.4.1.7165.2.1.4  cis single
+attribute       pwdLastSet              1.3.6.1.4.1.7165.2.1.3  int single
+attribute       logonTime               1.3.6.1.4.1.7165.2.1.5  int single
+attribute       logoffTime              1.3.6.1.4.1.7165.2.1.6  int single
+attribute       kickoffTime             1.3.6.1.4.1.7165.2.1.7  int single
+attribute       pwdCanChange            1.3.6.1.4.1.7165.2.1.8  int single
+attribute       pwdMustChange           1.3.6.1.4.1.7165.2.1.9  int single
+attribute       homedrive               1.3.6.1.4.1.7165.2.1.10 cis single
+attribute       scriptPath              1.3.6.1.4.1.7165.2.1.11 cis single
+attribute       profilePath             1.3.6.1.4.1.7165.2.1.12 cis single
+attribute       userWorkstations        1.3.6.1.4.1.7165.2.1.13 cis single
+attribute       rid                     1.3.6.1.4.1.7165.2.1.14 int single
+attribute       primaryGroupID          1.3.6.1.4.1.7165.2.1.15 int single
+attribute       smbHome                 1.3.6.1.4.1.7165.2.1.17 cis single
+attribute       domain                  1.3.6.1.4.1.7165.2.1.18 cis single
+
+objectclass sambaAccount
+       oid
+               1.3.1.5.1.4.1.7165.2.2.2
+       superior
+               top
+       requires
+               objectClass,
+               uid,
+               rid
+       allows
+               cn,
+               lmPassword,
+               ntPassword,
+               pwdLastSet,
+               logonTime,
+               logoffTime,
+               KickoffTime,
+               pwdCanChange,
+               pwdMustChange,
+               acctFlags,
+               displayName,
+               smbHome,
+               homeDrive,
+               scriptPath,
+               profilePath,
+               description,
+               userWorkstations,
+               primaryGroupID,
+               domain
+
diff --git a/examples/LDAP/samba-schema-netscapeds5.x b/examples/LDAP/samba-schema-netscapeds5.x
new file mode 100644
index 0000000000..0abc9d82e2
--- /dev/null
+++ b/examples/LDAP/samba-schema-netscapeds5.x
@@ -0,0 +1,74 @@
+##

+## submitted by Martin.Dehn@comparex.de

+##

+## Experiement sambaAccount schema file Netscape DS 5.0

+##

+## INSTALL-DIRECTORY/slapd-your_name/config/schema/samba-schema-netscapeds5.ldif

+##

+dn: cn=schema

+objectClass: top

+objectClass: ldapSubentry

+objectClass: subschema

+cn: schema

+aci: (target="ldap:///cn=schema")(targetattr !="aci")(version 3.0;acl "anonymo

+ us, no acis"; allow (read, search, compare) userdn = "ldap:///anyone";)

+aci: (targetattr = "*")(version 3.0; acl "Configuration Administrator"; allow 

+ (all) userdn = "ldap:///uid=admin,ou=Administrators, ou=TopologyManagement, 

+ o=NetscapeRoot";)

+aci: (targetattr = "*")(version 3.0; acl "Local Directory Administrators Group

+ "; allow (all) groupdn = "ldap:///cn=Directory Administrators, dc=samba,dc=org";)

+aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all)groupdn = "ld

+ ap:///cn=slapd-sambaldap, cn=iPlanet Directory Server, cn=Server Group, cn=iPlanetDirectory.samba.org, ou=samba.org, o=NetscapeRoot";)

+modifiersName: cn=directory manager

+modifyTimestamp: 20020322124844Z

+objectClasses: ( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTUR

+ AL MAY ( acctFlags $ domain $ homeDrive $ kickoffTime $ lmPassword $ logofft

+ ime $ logonTime $ ntPassword $ primaryGroupID $ profilePath $ pwdCanChange $

+  pwdLastSet $ pwdMustChange $ rid $ scriptPath $ smbHome $ userWorkstations 

+ ) X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath' DESC 'NT script pa

+ th' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined

+ ' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime' DESC 'NT logon time'

+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath' DESC 'NT profile 

+ path' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defin

+ ed' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange' DESC 'NT passwd c

+ an change' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user 

+ defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome' DESC 'smbHome' SYNTAX

+  1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet'  SYNTAX 1.3.6.1.4.1

+ .1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.18 NAME 'domain' DESC 'Windows NT domai

+ n Samba' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user de

+ fined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive' DESC 'NT home drive

+ ' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' 

+ )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.6 NAME 'logofftime' DESC 'logoff Time' 

+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID' DESC 'NT Group

+  RID' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defin

+ ed' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword' DESC 'LanManager Pa

+ sswd' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defin

+ ed' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange' DESC 'NT pwdmust

+ chnage' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user def

+ ined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags' DESC 'Account Flags'

+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations' DESC 'userWo

+ rkstations' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user

+  defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime' DESC 'NT kickoff T

+ ime' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user define

+ d' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid' DESC 'rid' SYNTAX 1.3.6.1

+ .4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )

+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword' DESC 'NT Passwd' SY

+ NTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'user defined' )

+nsSchemaCSN: 3c9b282c000000000000

+

diff --git a/examples/LDAP/samba-schema.IBMSecureWay b/examples/LDAP/samba-schema.IBMSecureWay
new file mode 100644
index 0000000000..1fca4a749a
--- /dev/null
+++ b/examples/LDAP/samba-schema.IBMSecureWay
@@ -0,0 +1,43 @@
+##
+## Submitted by Dirk Kastens <Dirk.Kastens@Uni-Osnabrueck.de>
+##
+## I translated the samba.schema to be used with IBM
+## SecureWay directoy server 3.2.2. You have to load
+## it in your slapd32.conf with:
+##
+## dn: cn=IBM SecureWay, cn=Schemas, cn=Configuration
+## cn: IBM SecureWay
+## ibm-slapdIncludeSchema: /etc/lapschema/samba.schema
+##
+objectClasses {
+( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' DESC 'Samba Account' SUP top MUST uid $ rid MAY ( acctFlags $ cn $ description $ displayName $ homeDrive $ kickoffTime $ lmPassword $ logoffTime $ logonTime $ ntPassword $ primaryGroupID $ profilePath $ pwdCanChange $ pwdLastSet $ pwdMustChange $ scriptPath $ smbHome $ userWorkstations ) )
+}
+
+attributeTypes {
+( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword' DESC 'LanManager Passwd' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive' DESC 'NT homeDrive' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath' DESC 'NT scriptPath' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath' DESC 'NT profilePath' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations' DESC 'userWorkstations' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid' DESC 'NT rid' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID' DESC 'NT Group RID' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome' DESC 'smbHome' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
+( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword' DESC 'NT Passwd' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet' DESC 'NT pwdLastSet' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags' DESC 'Account Flags' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime' DESC 'NT logonTime' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.6 NAME 'logoffTime' DESC 'NT logoffTime' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime' DESC 'NT kickoffTime' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange' DESC 'NT pwdCanChange' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange' DESC 'NT pwdMustChange' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+}
+
+IBMattributeTypes {
+}
+
+ldapSyntaxes {
+}
+
+matchingRules {
+}
+
diff --git a/examples/README b/examples/README
index 3e11ed4ad8..2222606714 100644
--- a/examples/README
+++ b/examples/README
@@ -1,11 +1,11 @@
-Copyright(C) Samba-Team 1993-1997
+Copyright(C) Samba-Team 1993-2001
 
-This directory contains example samba extensions, example config files and 
-related material for Samba. 
+This directory contains example config files and related material for
+Samba. 
 
 At a minimum please refer to the smb.conf.default file for current
 information regarding global and share parameter settings.
 
-Send additions to: samba-bugs@samba.org
+Send additions to: samba@samba.org
 
 
diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index f0c86cc6ee..417417d256 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -58,9 +58,17 @@
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
    security = user
+
 # Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
 ;   password server = <NT-Server-Name>
 
+# Note: Do NOT use the now deprecated option of "domain controller"
+# This option is no longer implemented.
+
 # You may wish to use password encryption. Please read
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
@@ -102,10 +110,6 @@
 # and gives it a slightly higher chance of winning the election
 ;   preferred master = yes
 
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
 # Enable this if you want Samba to be a domain logon server for 
 # Windows95 workstations. 
 ;   domain logons = yes