diff options
| author | Howard Chu <hyc@symas.com> | 2013-09-17 14:04:06 -0700 |
|---|---|---|
| committer | Nadezhda Ivanova <nivanova@samba.org> | 2013-09-18 19:47:55 +0200 |
| commit | 743d4a474e1d80783f658fa1001a6d077fcfbede (patch) | |
| tree | 506570ff9bb9488a860544edaf2d76b8bab869cf /python | |
| parent | 6bf59b03d72b94b71e53fc2404c11e0d237e41b2 (diff) | |
| download | samba-743d4a474e1d80783f658fa1001a6d077fcfbede.tar.gz samba-743d4a474e1d80783f658fa1001a6d077fcfbede.tar.bz2 samba-743d4a474e1d80783f658fa1001a6d077fcfbede.zip | |
Use SASL/EXTERNAL over ldapi://
The provision script will map the uid of the user running the
script to the samba-admin LDAP DN.
Signed-off-by: Howard Chu <hyc@symas.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/provision/backend.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py index 24d8675258..5360ef41f5 100644 --- a/python/samba/provision/backend.py +++ b/python/samba/provision/backend.py @@ -255,7 +255,7 @@ class LDAPBackend(ProvisionBackend): # Kerberos to an ldapi:// backend makes no sense self.credentials.set_kerberos_state(DONT_USE_KERBEROS) self.credentials.set_password(self.ldapadminpass) - self.credentials.set_forced_sasl_mech("DIGEST-MD5") + self.credentials.set_forced_sasl_mech("EXTERNAL") self.secrets_credentials = Credentials() self.secrets_credentials.guess(self.lp) @@ -263,7 +263,7 @@ class LDAPBackend(ProvisionBackend): self.secrets_credentials.set_kerberos_state(DONT_USE_KERBEROS) self.secrets_credentials.set_username("samba-admin") self.secrets_credentials.set_password(self.ldapadminpass) - self.secrets_credentials.set_forced_sasl_mech("DIGEST-MD5") + self.secrets_credentials.set_forced_sasl_mech("EXTERNAL") self.provision() @@ -533,7 +533,8 @@ class OpenLDAPBackend(LDAPBackend): "OLC_MMR_CONFIG": olc_mmr_config, "REFINT_CONFIG": refint_config, "INDEX_CONFIG": index_config, - "NOSYNC": nosync_config}) + "ADMIN_UID": str(os.getuid()), + "NOSYNC": nosync_config,}) self.setup_db_config(os.path.join(self.ldapdir, "db", "forestdns")) self.setup_db_config(os.path.join(self.ldapdir, "db", "domaindns")) |