summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-07-21 09:19:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:53 -0500
commitd3a2b03f7690ba0b8910d5b5ad37ca0cf67e3221 (patch)
tree3e9e9f36cd501b465347e39a7005bec290e845a6
parenta78558321a994dd02713c04ed3626b6d20d57cc7 (diff)
downloadsamba-d3a2b03f7690ba0b8910d5b5ad37ca0cf67e3221.tar.gz
samba-d3a2b03f7690ba0b8910d5b5ad37ca0cf67e3221.tar.bz2
samba-d3a2b03f7690ba0b8910d5b5ad37ca0cf67e3221.zip
r8674: With the rdn_name module, we don't need this duplication in the samdb
module any more. Andrew Bartlett (This used to be commit da48e77e7ca21bc99f2829a22ea3dc96ba413191)
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index e8403a09b5..f0f44cf4d5 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -421,17 +421,6 @@ static struct ldb_message *samldb_fill_group_object(struct ldb_module *module, c
}
}
- if ((attribute = samldb_find_attribute(msg2, "name", NULL)) != NULL) {
- if (strcasecmp(rdn->value.data, attribute->values[0].data) != 0) {
-
- return NULL;
- }
- } else { /* FIXME: remove this if ldb supports natively aliasing between the rdn and the "name" attribute */
- if ( ldb_msg_add_value(module->ldb, msg2, "name", &rdn->value)) {
- return NULL;
- }
- }
-
if ((attribute = samldb_find_attribute(msg2, "objectSid", NULL)) == NULL ) {
struct dom_sid *sid = samldb_get_new_sid(module, msg2, msg2->dn);
if (sid == NULL) {
@@ -512,17 +501,6 @@ static struct ldb_message *samldb_fill_user_or_computer_object(struct ldb_module
}
}
- if ((attribute = samldb_find_attribute(msg2, "name", NULL)) != NULL) {
- if (strcasecmp(rdn->value.data, attribute->values[0].data) != 0) {
- ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_user_or_computer_object: Bad Attribute Syntax for name\n");
- return NULL;
- }
- } else { /* FIXME: remove this if ldb supports natively aliasing between the rdn and the "name" attribute */
- if ( ldb_msg_add_value(module->ldb, msg2, "name", &rdn->value)) {
- return NULL;
- }
- }
-
if ((attribute = samldb_find_attribute(msg2, "objectSid", NULL)) == NULL ) {
struct dom_sid *sid;
sid = samldb_get_new_sid(module, msg2, msg2->dn);