diff options
| author | Andreas Schneider <asn@samba.org> | 2013-01-28 16:16:42 +0100 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2013-02-06 11:51:11 +0100 |
| commit | 1b582c4bf8ad46034eb30c758b085dc210e8096a (patch) | |
| tree | cf6bd37435776af4bb59d21f56bf33fc67f1bea0 /source3/passdb/pdb_ldap.c | |
| parent | 6ba7ab5c14801aecae96373d5a9db7ab82957526 (diff) | |
| download | samba-1b582c4bf8ad46034eb30c758b085dc210e8096a.tar.gz samba-1b582c4bf8ad46034eb30c758b085dc210e8096a.tar.bz2 samba-1b582c4bf8ad46034eb30c758b085dc210e8096a.zip | |
Rename pdb_ldap to pdb_ldapsam
This patch moves pdb_ldap to pdb_ldapsam unconditionally
and makes possible to load ldapsam.so dynamically
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 6899b26464..dc6a9c3239 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -6439,7 +6439,8 @@ static NTSTATUS pdb_init_ldapsam_common(struct pdb_methods **pdb_method, const c Initialise the normal mode for pdb_ldap *********************************************************************/ -NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location) +NTSTATUS pdb_ldapsam_init_common(struct pdb_methods **pdb_method, + const char *location) { NTSTATUS nt_status; struct ldapsam_privates *ldap_state = NULL; @@ -6588,11 +6589,16 @@ NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location) return NT_STATUS_OK; } -NTSTATUS pdb_ldap_init(void) +NTSTATUS pdb_ldapsam_init(void) { NTSTATUS nt_status; - if (!NT_STATUS_IS_OK(nt_status = smb_register_passdb(PASSDB_INTERFACE_VERSION, "ldapsam", pdb_init_ldapsam))) + + nt_status = smb_register_passdb(PASSDB_INTERFACE_VERSION, + "ldapsam", + pdb_ldapsam_init_common); + if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; + } /* Let pdb_nds register backends */ pdb_nds_init(); |