diff options
author | Simo Sorce <idra@samba.org> | 2003-04-27 12:47:41 +0000 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2003-04-27 12:47:41 +0000 |
commit | 88e41f9e20c3498fe12190da71b9c154332a7cd8 (patch) | |
tree | e6b20b2eac63832c2046142a145aabc7969ed1c3 /source3/passdb/pdb_ldap.c | |
parent | e06940968abc20336e4eecc93ac2bdb1b1639855 (diff) | |
download | samba-88e41f9e20c3498fe12190da71b9c154332a7cd8.tar.gz samba-88e41f9e20c3498fe12190da71b9c154332a7cd8.tar.bz2 samba-88e41f9e20c3498fe12190da71b9c154332a7cd8.zip |
prepare to get _nua out of the door (but back in from the window ;-)
(This used to be commit 09eb02cba0747ae47aa4a76f4fac69af293a774a)
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
-rw-r--r-- | source3/passdb/pdb_ldap.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 6d747ef911..0ebbd446ec 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1993,6 +1993,7 @@ NTSTATUS pdb_init_ldapsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, co { NTSTATUS nt_status; struct smb_ldap_privates *ldap_state; + uint32 low_nua_uid, high_nua_uid; if (!NT_STATUS_IS_OK(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) { return nt_status; @@ -2051,40 +2052,21 @@ NTSTATUS pdb_init_ldapsam(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, co (*pdb_method)->free_private_data = free_private_data; - return NT_STATUS_OK; -} + if (lp_idmap_uid(&low_nua_uid, &high_nua_uid)) { + DEBUG(0, ("idmap uid range defined, non unix accounts enabled\n")); -NTSTATUS pdb_init_ldapsam_nua(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char *location) -{ - NTSTATUS nt_status; - struct smb_ldap_privates *ldap_state; - uint32 low_nua_uid, high_nua_uid; - - if (!NT_STATUS_IS_OK(nt_status = pdb_init_ldapsam(pdb_context, pdb_method, location))) { - return nt_status; - } - - (*pdb_method)->name = "ldapsam_nua"; - - ldap_state = (*pdb_method)->private_data; - - ldap_state->permit_non_unix_accounts = True; + ldap_state->permit_non_unix_accounts = True; + + ldap_state->low_nua_rid=fallback_pdb_uid_to_user_rid(low_nua_uid); - if (!lp_non_unix_account_range(&low_nua_uid, &high_nua_uid)) { - DEBUG(0, ("cannot use ldapsam_nua without 'non unix account range' in smb.conf!\n")); - return NT_STATUS_UNSUCCESSFUL; + ldap_state->high_nua_rid=fallback_pdb_uid_to_user_rid(high_nua_uid); } - ldap_state->low_nua_rid=fallback_pdb_uid_to_user_rid(low_nua_uid); - - ldap_state->high_nua_rid=fallback_pdb_uid_to_user_rid(high_nua_uid); - return NT_STATUS_OK; } int pdb_ldap_init(void) { smb_register_passdb("ldapsam", pdb_init_ldapsam, PASSDB_INTERFACE_VERSION); - smb_register_passdb("ldapsam_nua", pdb_init_ldapsam_nua, PASSDB_INTERFACE_VERSION); return True; } |