diff options
Diffstat (limited to 'source3/passdb')
-rw-r--r-- | source3/passdb/pdb_ldap.c | 1 | ||||
-rw-r--r-- | source3/passdb/pdb_ldap_util.c | 335 | ||||
-rw-r--r-- | source3/passdb/pdb_ldap_util.h | 32 | ||||
-rw-r--r-- | source3/passdb/wscript_build | 2 |
4 files changed, 369 insertions, 1 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index a89af8051b..03242b8b97 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -63,6 +63,7 @@ #include "passdb/pdb_ldap.h" #include "passdb/pdb_nds.h" #include "passdb/pdb_ipa.h" +#include "passdb/pdb_ldap_util.h" /********************************************************************** Simple helper function to make stuff better readable diff --git a/source3/passdb/pdb_ldap_util.c b/source3/passdb/pdb_ldap_util.c new file mode 100644 index 0000000000..048cbe6493 --- /dev/null +++ b/source3/passdb/pdb_ldap_util.c @@ -0,0 +1,335 @@ +/* + Unix SMB/CIFS mplementation. + LDAP protocol helper functions for SAMBA + Copyright (C) Jean François Micouleau 1998 + Copyright (C) Gerald Carter 2001-2003 + Copyright (C) Shahms King 2001 + Copyright (C) Andrew Bartlett 2002-2003 + Copyright (C) Stefan (metze) Metzmacher 2002-2003 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +*/ + +#include "includes.h" +#include "smbldap.h" +#include "passdb.h" + +/********************************************************************** + Add the account-policies below the sambaDomain object to LDAP, +*********************************************************************/ + +static NTSTATUS add_new_domain_account_policies(struct smbldap_state *ldap_state, + const char *domain_name) +{ + NTSTATUS ntstatus = NT_STATUS_UNSUCCESSFUL; + int i, rc; + uint32 policy_default; + const char *policy_attr = NULL; + char *dn = NULL; + LDAPMod **mods = NULL; + char *escape_domain_name; + + DEBUG(3,("add_new_domain_account_policies: Adding new account policies for domain\n")); + + escape_domain_name = escape_rdn_val_string_alloc(domain_name); + if (!escape_domain_name) { + DEBUG(0, ("Out of memory!\n")); + return NT_STATUS_NO_MEMORY; + } + + if (asprintf(&dn, "%s=%s,%s", + get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN), + escape_domain_name, lp_ldap_suffix()) < 0) { + SAFE_FREE(escape_domain_name); + return NT_STATUS_NO_MEMORY; + } + + SAFE_FREE(escape_domain_name); + + for (i=1; decode_account_policy_name(i) != NULL; i++) { + char *val = NULL; + + policy_attr = get_account_policy_attr(i); + if (!policy_attr) { + DEBUG(0,("add_new_domain_account_policies: ops. no policy!\n")); + continue; + } + + if (!account_policy_get_default(i, &policy_default)) { + DEBUG(0,("add_new_domain_account_policies: failed to get default account policy\n")); + SAFE_FREE(dn); + return ntstatus; + } + + DEBUG(10,("add_new_domain_account_policies: adding \"%s\" with value: %d\n", policy_attr, policy_default)); + + if (asprintf(&val, "%d", policy_default) < 0) { + SAFE_FREE(dn); + return NT_STATUS_NO_MEMORY; + } + + smbldap_set_mod( &mods, LDAP_MOD_REPLACE, policy_attr, val); + + rc = smbldap_modify(ldap_state, dn, mods); + + SAFE_FREE(val); + + if (rc!=LDAP_SUCCESS) { + char *ld_error = NULL; + ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_ERROR_STRING, &ld_error); + DEBUG(1,("add_new_domain_account_policies: failed to add account policies to dn= %s with: %s\n\t%s\n", + dn, ldap_err2string(rc), + ld_error ? ld_error : "unknown")); + SAFE_FREE(ld_error); + SAFE_FREE(dn); + ldap_mods_free(mods, True); + return ntstatus; + } + } + + SAFE_FREE(dn); + ldap_mods_free(mods, True); + + return NT_STATUS_OK; +} + +/********************************************************************** + Add the sambaDomain to LDAP, so we don't have to search for this stuff + again. This is a once-add operation for now. + + TODO: Add other attributes, and allow modification. +*********************************************************************/ + +static NTSTATUS add_new_domain_info(struct smbldap_state *ldap_state, + const char *domain_name) +{ + fstring sid_string; + fstring algorithmic_rid_base_string; + char *filter = NULL; + char *dn = NULL; + LDAPMod **mods = NULL; + int rc; + LDAPMessage *result = NULL; + int num_result; + const char **attr_list; + char *escape_domain_name; + + /* escape for filter */ + escape_domain_name = escape_ldap_string(talloc_tos(), domain_name); + if (!escape_domain_name) { + DEBUG(0, ("Out of memory!\n")); + return NT_STATUS_NO_MEMORY; + } + + if (asprintf(&filter, "(&(%s=%s)(objectclass=%s))", + get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN), + escape_domain_name, LDAP_OBJ_DOMINFO) < 0) { + TALLOC_FREE(escape_domain_name); + return NT_STATUS_NO_MEMORY; + } + + TALLOC_FREE(escape_domain_name); + + attr_list = get_attr_list(NULL, dominfo_attr_list ); + rc = smbldap_search_suffix(ldap_state, filter, attr_list, &result); + TALLOC_FREE( attr_list ); + SAFE_FREE(filter); + + if (rc != LDAP_SUCCESS) { + return NT_STATUS_UNSUCCESSFUL; + } + + num_result = ldap_count_entries(ldap_state->ldap_struct, result); + + if (num_result > 1) { + DEBUG (0, ("add_new_domain_info: More than domain with that name exists: bailing " + "out!\n")); + ldap_msgfree(result); + return NT_STATUS_UNSUCCESSFUL; + } + + /* Check if we need to add an entry */ + DEBUG(3,("add_new_domain_info: Adding new domain\n")); + + /* this time escape for DN */ + escape_domain_name = escape_rdn_val_string_alloc(domain_name); + if (!escape_domain_name) { + DEBUG(0, ("Out of memory!\n")); + return NT_STATUS_NO_MEMORY; + } + + if (asprintf(&dn, "%s=%s,%s", + get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN), + escape_domain_name, lp_ldap_suffix()) < 0) { + SAFE_FREE(escape_domain_name); + return NT_STATUS_NO_MEMORY; + } + + SAFE_FREE(escape_domain_name); + + /* Free original search */ + ldap_msgfree(result); + + /* make the changes - the entry *must* not already have samba + * attributes */ + + smbldap_set_mod(&mods, LDAP_MOD_ADD, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_DOMAIN), + domain_name); + + /* If we don't have an entry, then ask secrets.tdb for what it thinks. + It may choose to make it up */ + + sid_to_fstring(sid_string, get_global_sam_sid()); + smbldap_set_mod(&mods, LDAP_MOD_ADD, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_DOM_SID), + sid_string); + + slprintf(algorithmic_rid_base_string, + sizeof(algorithmic_rid_base_string) - 1, "%i", + algorithmic_rid_base()); + smbldap_set_mod(&mods, LDAP_MOD_ADD, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_ALGORITHMIC_RID_BASE), + algorithmic_rid_base_string); + smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectclass", LDAP_OBJ_DOMINFO); + + /* add the sambaNextUserRid attributes. */ + + { + uint32 rid = BASE_RID; + fstring rid_str; + + fstr_sprintf( rid_str, "%i", rid ); + DEBUG(10,("add_new_domain_info: setting next available user rid [%s]\n", rid_str)); + smbldap_set_mod(&mods, LDAP_MOD_ADD, + get_attr_key2string(dominfo_attr_list, + LDAP_ATTR_NEXT_USERRID), + rid_str); + } + + + rc = smbldap_add(ldap_state, dn, mods); + + if (rc!=LDAP_SUCCESS) { + char *ld_error = NULL; + ldap_get_option(ldap_state->ldap_struct, + LDAP_OPT_ERROR_STRING, &ld_error); + DEBUG(1,("add_new_domain_info: failed to add domain dn= %s with: %s\n\t%s\n", + dn, ldap_err2string(rc), + ld_error?ld_error:"unknown")); + SAFE_FREE(ld_error); + SAFE_FREE(dn); + ldap_mods_free(mods, True); + return NT_STATUS_UNSUCCESSFUL; + } + + DEBUG(2,("add_new_domain_info: added: domain = %s in the LDAP database\n", domain_name)); + ldap_mods_free(mods, True); + SAFE_FREE(dn); + return NT_STATUS_OK; +} + +/********************************************************************** +Search for the domain info entry +*********************************************************************/ + +NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state, + LDAPMessage ** result, const char *domain_name, + bool try_add) +{ + NTSTATUS status = NT_STATUS_UNSUCCESSFUL; + char *filter = NULL; + int rc; + const char **attr_list; + int count; + char *escape_domain_name; + + escape_domain_name = escape_ldap_string(talloc_tos(), domain_name); + if (!escape_domain_name) { + DEBUG(0, ("Out of memory!\n")); + return NT_STATUS_NO_MEMORY; + } + + if (asprintf(&filter, "(&(objectClass=%s)(%s=%s))", + LDAP_OBJ_DOMINFO, + get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN), + escape_domain_name) < 0) { + TALLOC_FREE(escape_domain_name); + return NT_STATUS_NO_MEMORY; + } + + TALLOC_FREE(escape_domain_name); + + DEBUG(2, ("smbldap_search_domain_info: Searching for:[%s]\n", filter)); + + attr_list = get_attr_list( NULL, dominfo_attr_list ); + rc = smbldap_search_suffix(ldap_state, filter, attr_list , result); + TALLOC_FREE( attr_list ); + + if (rc != LDAP_SUCCESS) { + DEBUG(2,("smbldap_search_domain_info: Problem during LDAPsearch: %s\n", ldap_err2string (rc))); + DEBUG(2,("smbldap_search_domain_info: Query was: %s, %s\n", lp_ldap_suffix(), filter)); + goto failed; + } + + SAFE_FREE(filter); + + count = ldap_count_entries(ldap_state->ldap_struct, *result); + + if (count == 1) { + return NT_STATUS_OK; + } + + ldap_msgfree(*result); + *result = NULL; + + if (count < 1) { + + DEBUG(3, ("smbldap_search_domain_info: Got no domain info entries for domain\n")); + + if (!try_add) + goto failed; + + status = add_new_domain_info(ldap_state, domain_name); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("smbldap_search_domain_info: Adding domain info for %s failed with %s\n", + domain_name, nt_errstr(status))); + goto failed; + } + + status = add_new_domain_account_policies(ldap_state, domain_name); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("smbldap_search_domain_info: Adding domain account policies for %s failed with %s\n", + domain_name, nt_errstr(status))); + goto failed; + } + + return smbldap_search_domain_info(ldap_state, result, domain_name, False); + + } + + if (count > 1 ) { + + DEBUG(0, ("smbldap_search_domain_info: Got too many (%d) domain info entries for domain %s\n", + count, domain_name)); + goto failed; + } + +failed: + return status; +} diff --git a/source3/passdb/pdb_ldap_util.h b/source3/passdb/pdb_ldap_util.h new file mode 100644 index 0000000000..fa1e96c7c9 --- /dev/null +++ b/source3/passdb/pdb_ldap_util.h @@ -0,0 +1,32 @@ +/* + Unix SMB/CIFS mplementation. + LDAP protocol helper functions for SAMBA + Copyright (C) Gerald Carter 2001-2003 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +*/ + +#ifndef _PASSDB_PDB_LDAP_UTIL_H_ +#define _PASSDB_PDB_LDAP_UTIL_H_ + +/* The following definitions come from passdb/pdb_ldap_util.c */ + +#ifdef HAVE_LDAP +NTSTATUS smbldap_search_domain_info(struct smbldap_state *ldap_state, + LDAPMessage ** result, const char *domain_name, + bool try_add); +#endif /* HAVE_LDAP */ + +#endif /* _PASSDB_PDB_LDAP_UTIL_H_ */ diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index b18d873083..24acf1afc5 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python PDB_TDBSAM_SRC = 'pdb_tdb.c' -PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c' +PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c' PDB_ADS_SRC = 'pdb_ads.c' PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c' PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c' |