sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-05 12:22:11 +03:00
Code Activity

Use SASL/EXTERNAL over ldapi://

Browse Source 
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>
This commit is contained in:
Howard Chu
2013-09-17 14:04:06 -07:00
committed by Nadezhda Ivanova
parent 6bf59b03d7
commit 743d4a474e
3 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/provision/backend.py
View File

@ -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"))