diff options
| author | Howard Chu <hyc@symas.com> | 2013-09-17 15:38:42 -0700 |
|---|---|---|
| committer | Nadezhda Ivanova <nivanova@samba.org> | 2013-09-18 21:39:51 +0200 |
| commit | 31ca4fc67443e0c7a8fec61e91df39fe2535982e (patch) | |
| tree | dfeef4d13e4c3fc32888011962d694b5ba8d72b7 /source4 | |
| parent | 743d4a474e1d80783f658fa1001a6d077fcfbede (diff) | |
| download | samba-31ca4fc67443e0c7a8fec61e91df39fe2535982e.tar.gz samba-31ca4fc67443e0c7a8fec61e91df39fe2535982e.tar.bz2 samba-31ca4fc67443e0c7a8fec61e91df39fe2535982e.zip | |
OpenLDAP provisioning tweaks
Remove BerkeleyDB-specific setup.
Streamline cn=samba partition initialization - allow any backend type for it.
Use back-mdb instead of back-ldif for cn=samba partition
Signed-off-by: Howard Chu <hyc@symas.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>
Autobuild-User(master): Nadezhda Ivanova <nivanova@samba.org>
Autobuild-Date(master): Wed Sep 18 21:39:51 CEST 2013 on sn-devel-104
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/setup/cn=replicator.ldif | 12 | ||||
| -rw-r--r-- | source4/setup/cn=samba-admin.ldif | 12 | ||||
| -rw-r--r-- | source4/setup/cn=samba.ldif | 19 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 2 |
4 files changed, 13 insertions, 32 deletions
diff --git a/source4/setup/cn=replicator.ldif b/source4/setup/cn=replicator.ldif deleted file mode 100644 index 6001456b4d..0000000000 --- a/source4/setup/cn=replicator.ldif +++ /dev/null @@ -1,12 +0,0 @@ -dn: cn=replicator -objectClass: top -objectClass: person -cn: replicator -userPassword:: ${MMR_PASSWORD_B64} -structuralObjectClass: person -entryUUID: ${UUID} -creatorsName: -createTimestamp: ${LDAPTIME} -entryCSN: 20080714010529.241039Z#000000#000#000000 -modifiersName: -modifyTimestamp: ${LDAPTIME} diff --git a/source4/setup/cn=samba-admin.ldif b/source4/setup/cn=samba-admin.ldif deleted file mode 100644 index c59ffd9ab6..0000000000 --- a/source4/setup/cn=samba-admin.ldif +++ /dev/null @@ -1,12 +0,0 @@ -dn: cn=samba-admin -objectClass: top -objectClass: person -cn: samba-admin -userPassword:: ${LDAPADMINPASS_B64} -structuralObjectClass: person -entryUUID: ${UUID} -creatorsName: -createTimestamp: ${LDAPTIME} -entryCSN: 20080714010529.241038Z#000000#000#000000 -modifiersName: -modifyTimestamp: ${LDAPTIME} diff --git a/source4/setup/cn=samba.ldif b/source4/setup/cn=samba.ldif index 3be6242fe3..79d806ccf6 100644 --- a/source4/setup/cn=samba.ldif +++ b/source4/setup/cn=samba.ldif @@ -2,10 +2,15 @@ dn: cn=Samba objectClass: top objectClass: container cn: Samba -structuralObjectClass: container -entryUUID: b1d4823a-e58c-102c-9f74-51b6d59a1b68 -creatorsName: -createTimestamp: 20080714010529Z -entryCSN: 20080714010529.194412Z#000000#000#000000 -modifiersName: -modifyTimestamp: 20080714010529Z + +dn: cn=samba-admin,cn=samba +objectClass: top +objectClass: person +cn: samba-admin +userPassword: ${LDAPADMINPASS} + +${MMR}dn: cn=replicator,cn=samba +${MMR}objectClass: top +${MMR}objectClass: person +${MMR}cn: replicator +${MMR}userPassword: ${MMR_PASSWORD} diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index 231ef82386..91406b6430 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -65,7 +65,7 @@ ${MEMBEROF_CONFIG} moduleload syncprov -database ldif +database mdb suffix cn=Samba directory ${LDAPDIR}/db/samba rootdn cn=Manager,cn=Samba |