diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-08-22 17:37:43 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-08-22 17:37:43 +1000 |
| commit | 0a27ff953e17670aecc7aedb56c0f872cc4bb75d (patch) | |
| tree | 18ed167d94e1a50acf04bc22fc6d8f01bf7f1a5f /source4/setup | |
| parent | 8acc7f7da7718c7750387c1043391618be46e15b (diff) | |
| parent | cc43037f19056ed24d7fffa54456d597c63ad105 (diff) | |
| download | samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.tar.gz samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.tar.bz2 samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.zip | |
Merge branch 'abartlet-4-0-local' into v4-0-test
(This used to be commit 469fac2669991b130dec219e1a109a8b2ce224be)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision-backend | 2 | ||||
| -rw-r--r-- | source4/setup/provision_index.ldif | 19 | ||||
| -rw-r--r-- | source4/setup/provision_init.ldif | 7 |
3 files changed, 8 insertions, 20 deletions
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index 049b8752a6..0943da29b6 100755 --- a/source4/setup/provision-backend +++ b/source4/setup/provision-backend @@ -65,7 +65,7 @@ parser.add_option("--server-role", type="choice", metavar="ROLE", parser.add_option("--targetdir", type="string", metavar="DIR", help="Set target directory") parser.add_option("--ol-mmr-urls", type="string", metavar="LDAPSERVER", - help="List of LDAP-URLS separated with whitespaces for Use with OpenLDAP-MMR") + help="List of LDAP-URLS [ ldap://<FQDN>:port/ (where port != 389) ] separated with whitespaces for use with OpenLDAP-MMR") opts = parser.parse_args()[0] diff --git a/source4/setup/provision_index.ldif b/source4/setup/provision_index.ldif deleted file mode 100644 index 95970817f3..0000000000 --- a/source4/setup/provision_index.ldif +++ /dev/null @@ -1,19 +0,0 @@ -dn: @INDEXLIST -@IDXATTR: name -@IDXATTR: cn -@IDXATTR: userPrincipalName -@IDXATTR: servicePrincipalName -@IDXATTR: sAMAccountName -@IDXATTR: objectSid -@IDXATTR: objectCategory -@IDXATTR: member -@IDXATTR: uidNumber -@IDXATTR: gidNumber -@IDXATTR: unixName -@IDXATTR: privilege -@IDXATTR: nCName -@IDXATTR: lDAPDisplayName -@IDXATTR: subClassOf -@IDXATTR: dnsRoot -@IDXATTR: nETBIOSName -@IDXATTR: objectGUID diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif index 65a12f1afa..a6c591dd51 100644 --- a/source4/setup/provision_init.ldif +++ b/source4/setup/provision_init.ldif @@ -1,3 +1,8 @@ +#These attributes are only used as far as the bootstrapping of the +# schema. After that, the attributes from the schema are used. +# +# Therefore, they must strictly match the schema + dn: @ATTRIBUTES userPrincipalName: CASE_INSENSITIVE servicePrincipalName: CASE_INSENSITIVE @@ -7,6 +12,8 @@ nETBIOSName: CASE_INSENSITIVE cn: CASE_INSENSITIVE dc: CASE_INSENSITIVE name: CASE_INSENSITIVE +lDAPDisplayName: CASE_INSENSITIVE +subClassOf: CASE_INSENSITIVE dn: CASE_INSENSITIVE sAMAccountName: CASE_INSENSITIVE objectClass: CASE_INSENSITIVE |