From: Douglas Bagnall Date: Sun, 20 Dec 2020 07:34:16 +0000 (+1300) Subject: pdb_samba_dsdb: remove #if 0 block X-Git-Tag: tevent-0.11.0~1477 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3c56229fbbb936121f183c360ffcf1d10f6db24;p=thirdparty%2Fsamba.git pdb_samba_dsdb: remove #if 0 block Doing nothng since 2011 Signed-off-by: Douglas Bagnall Reviewed-by: Jeremy Allison --- diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c index 93e8f5bebe6..9d1fcf8bd42 100644 --- a/source3/passdb/pdb_samba_dsdb.c +++ b/source3/passdb/pdb_samba_dsdb.c @@ -1624,87 +1624,6 @@ static NTSTATUS pdb_samba_dsdb_delete_alias(struct pdb_methods *m, return NT_STATUS_OK; } -#if 0 -static NTSTATUS pdb_samba_dsdb_set_aliasinfo(struct pdb_methods *m, - const struct dom_sid *sid, - struct acct_info *info) -{ - struct pdb_samba_dsdb_state *state = talloc_get_type_abort( - m->private_data, struct pdb_samba_dsdb_state); - struct tldap_context *ld; - const char *attrs[3] = { "objectSid", "description", - "samAccountName" }; - struct ldb_message **msg; - char *sidstr, *dn; - int rc; - struct tldap_mod *mods; - int num_mods; - bool ok; - - ld = pdb_samba_dsdb_ld(state); - if (ld == NULL) { - return NT_STATUS_LDAP(TLDAP_SERVER_DOWN); - } - - sidstr = sid_binstring(talloc_tos(), sid); - NT_STATUS_HAVE_NO_MEMORY(sidstr); - - rc = pdb_samba_dsdb_search_fmt(state, state->domaindn, TLDAP_SCOPE_SUB, - attrs, ARRAY_SIZE(attrs), 0, talloc_tos(), - &msg, "(&(objectSid=%s)(objectclass=group)" - "(|(grouptype=%d)(grouptype=%d)))", - sidstr, GTYPE_SECURITY_BUILTIN_LOCAL_GROUP, - GTYPE_SECURITY_DOMAIN_LOCAL_GROUP); - TALLOC_FREE(sidstr) - if (rc != LDB_SUCCESS) { - DEBUG(10, ("ldap_search failed %s\n", - ldb_errstring(state->ldb))); - return NT_STATUS_LDAP(rc); - } - switch talloc_array_length(msg) { - case 0: - return NT_STATUS_NO_SUCH_ALIAS; - case 1: - break; - default: - return NT_STATUS_INTERNAL_DB_CORRUPTION; - } - - if (!tldap_entry_dn(msg[0], &dn)) { - TALLOC_FREE(msg); - return NT_STATUS_INTERNAL_DB_CORRUPTION; - } - - mods = NULL; - num_mods = 0; - ok = true; - - ok &= tldap_make_mod_fmt( - msg[0], msg, &num_mods, &mods, "description", - "%s", info->acct_desc); - ok &= tldap_make_mod_fmt( - msg[0], msg, &num_mods, &mods, "samAccountName", - "%s", info->acct_name); - if (!ok) { - TALLOC_FREE(msg); - return NT_STATUS_NO_MEMORY; - } - if (num_mods == 0) { - /* no change */ - TALLOC_FREE(msg); - return NT_STATUS_OK; - } - - rc = tldap_modify(ld, dn, num_mods, mods, NULL, 0, NULL, 0); - TALLOC_FREE(msg); - if (rc != LDB_SUCCESS) { - DEBUG(10, ("ldap_modify failed: %s\n", - ldb_errstring(state->ldb))); - return NT_STATUS_LDAP(rc); - } - return NT_STATUS_OK; -} -#endif static NTSTATUS pdb_samba_dsdb_add_aliasmem(struct pdb_methods *m, const struct dom_sid *alias, const struct dom_sid *member)