LDB:rdn name module - change counters to "unsigned" where appropriate

[ira/wip.git] / source4 / lib / ldb / modules / rdn_name.c

diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index 880678d89de4f576dd808573babdffca2e456724..a473f251af61aadaadf7d1e444ead25c36fd8fe3 100644 (file)
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -1,8 +1,8 @@
 /* 
    ldb database library
 
-   Copyright (C) Andrew Bartlet 2005
-   Copyright (C) Simo Sorce     2006-2008
+   Copyright (C) Andrew Bartlett 2005-2009
+   Copyright (C) Simo Sorce 2006-2008
 
      ** NOTE! The following LGPL license applies to the ldb
      ** library. This does NOT imply that all of Samba is released
@@ -23,13 +23,13 @@
 */
 
 /*
- *  Name: rdb_name
+ *  Name: rdn_name
  *
  *  Component: ldb rdn name module
  *
  *  Description: keep a consistent name attribute on objects manpulations
  *
- *  Author: Andrew Bartlet
+ *  Author: Andrew Bartlett
  *
  *  Modifications:
  *    - made the module async
@@ -40,7 +40,6 @@
 #include "ldb_module.h"
 
 struct rename_context {
-
        struct ldb_module *module;
        struct ldb_request *req;
 
@@ -49,7 +48,7 @@ struct rename_context {
 
 static struct ldb_message_element *rdn_name_find_attribute(const struct ldb_message *msg, const char *name)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < msg->num_elements; i++) {
                if (ldb_attr_cmp(name, msg->elements[i].name) == 0) {
@@ -95,10 +94,10 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
        const struct ldb_schema_attribute *a;
        const char *rdn_name;
        struct ldb_val rdn_val;
-       int i, ret;
+       unsigned int i;
+       int ret;
 
        ldb = ldb_module_get_ctx(module);
-       ldb_debug(ldb, LDB_DEBUG_TRACE, "rdn_name_add_record\n");
 
        /* do not manipulate our control entries */
        if (ldb_dn_is_special(req->op.add.message->dn)) {
@@ -120,7 +119,6 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
 
        rdn_name = ldb_dn_get_rdn_name(msg->dn);
        if (rdn_name == NULL) {
-               talloc_free(ac);
                return LDB_ERR_OPERATIONS_ERROR;
        }
        
@@ -132,7 +130,6 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
        }
 
        if (ldb_msg_add_value(msg, "name", &rdn_val, NULL) != 0) {
-               talloc_free(ac);
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
@@ -140,7 +137,6 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
 
        if (!attribute) {
                if (ldb_msg_add_value(msg, rdn_name, &rdn_val, NULL) != 0) {
-                       talloc_free(ac);
                        return LDB_ERR_OPERATIONS_ERROR;
                }
        } else {
@@ -156,10 +152,17 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
                        }
                }
                if (i == attribute->num_values) {
-                       ldb_debug_set(ldb, LDB_DEBUG_FATAL, 
-                                     "RDN mismatch on %s: %s (%s)", 
-                                     ldb_dn_get_linearized(msg->dn), rdn_name, rdn_val.data);
-                       talloc_free(ac);
+                       char *rdn_errstring = talloc_asprintf(ac,
+                               "RDN mismatch on %s: %s (%.*s) should match one of:", 
+                               ldb_dn_get_linearized(msg->dn), rdn_name, 
+                               (int)rdn_val.length, (const char *)rdn_val.data);
+                       for (i = 0; i < attribute->num_values; i++) {
+                               rdn_errstring = talloc_asprintf_append(
+                                       rdn_errstring, " (%.*s)",
+                                       (int)attribute->values[i].length, 
+                                       (const char *)attribute->values[i].data);
+                       }
+                       ldb_set_errstring(ldb, rdn_errstring);
                        /* Match AD's error here */
                        return LDB_ERR_INVALID_DN_SYNTAX;
                }
@@ -272,12 +275,12 @@ static int rdn_rename_callback(struct ldb_request *req, struct ldb_reply *ares)
        }
        talloc_steal(mod_req, msg);
 
-       /* do the mod call */
-       return ldb_request(ldb, mod_req);
+       /* go on with the call chain */
+       return ldb_next_request(ac->module, mod_req);
 
 error:
        return ldb_module_done(ac->req, NULL, NULL,
-                                               LDB_ERR_OPERATIONS_ERROR);
+                                                LDB_ERR_OPERATIONS_ERROR);
 }
 
 static int rdn_name_rename(struct ldb_module *module, struct ldb_request *req)
@@ -288,7 +291,6 @@ static int rdn_name_rename(struct ldb_module *module, struct ldb_request *req)
        int ret;
 
        ldb = ldb_module_get_ctx(module);
-       ldb_debug(ldb, LDB_DEBUG_TRACE, "rdn_name_rename\n");
 
        /* do not manipulate our control entries */
        if (ldb_dn_is_special(req->op.rename.newdn)) {
@@ -314,15 +316,43 @@ static int rdn_name_rename(struct ldb_module *module, struct ldb_request *req)
                                   req);
 
        if (ret != LDB_SUCCESS) {
-               return LDB_ERR_OPERATIONS_ERROR;
+               return ret;
        }
 
        /* rename first, modify "name" if rename is ok */
        return ldb_next_request(module, down_req);
 }
 
+static int rdn_name_modify(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ldb_context *ldb;
+
+       ldb = ldb_module_get_ctx(module);
+
+       /* do not manipulate our control entries */
+       if (ldb_dn_is_special(req->op.mod.message->dn)) {
+               return ldb_next_request(module, req);
+       }
+
+       if (ldb_msg_find_element(req->op.mod.message, "name")) {
+               ldb_asprintf_errstring(ldb, "Modify of 'name' on %s not permitted, must use 'rename' operation instead",
+                                      ldb_dn_get_linearized(req->op.mod.message->dn));
+               return LDB_ERR_NOT_ALLOWED_ON_RDN;
+       }
+
+       if (ldb_msg_find_element(req->op.mod.message, ldb_dn_get_rdn_name(req->op.mod.message->dn))) {
+               ldb_asprintf_errstring(ldb, "Modify of RDN '%s' on %s not permitted, must use 'rename' operation instead",
+                                      ldb_dn_get_rdn_name(req->op.mod.message->dn), ldb_dn_get_linearized(req->op.mod.message->dn));
+               return LDB_ERR_NOT_ALLOWED_ON_RDN;
+       }
+
+       /* All OK, they kept their fingers out of the special attributes */
+       return ldb_next_request(module, req);
+}
+
 const struct ldb_module_ops ldb_rdn_name_module_ops = {
        .name              = "rdn_name",
        .add               = rdn_name_add,
-       .rename            = rdn_name_rename,
+       .modify            = rdn_name_modify,
+       .rename            = rdn_name_rename
 };