git.samba.org / ddiss / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
dsdb-schema: do not reload more often than schema_reload_interval
[ddiss/samba.git] / source4 / ldap_server / ldap_backend.c
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index e96caa6b07ef51c913e8a1397d6108cc304da70d..000d7e28f8144b2baf4c7983f8ab1a1950c66507 100644 (file)
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -30,17 +30,6 @@
 #include <ldb_module.h>
 #include "ldb_wrap.h"
 
-#define VALID_DN_SYNTAX(dn) do {\
-       if (!(dn)) {\
-               return NT_STATUS_NO_MEMORY;\
-       } else if ( ! ldb_dn_validate(dn)) {\
-               result = LDAP_INVALID_DN_SYNTAX;\
-               map_ldb_error(local_ctx, LDB_ERR_INVALID_DN_SYNTAX, NULL,\
-                             &errstr);\
-               goto reply;\
-       }\
-} while(0)
-
 static int map_ldb_error(TALLOC_CTX *mem_ctx, int ldb_err,
        const char *add_err_string, const char **errstring)
 {
@@ -180,12 +169,8 @@ static int map_ldb_error(TALLOC_CTX *mem_ctx, int ldb_err,
        }
 
        *errstring = talloc_asprintf(mem_ctx, "%08X: %s", W_ERROR_V(err),
-               ldb_strerror(ldb_err));
-       if (add_err_string != NULL) {
-               *errstring = talloc_asprintf(mem_ctx, "%s - %s", *errstring,
-                                            add_err_string);
-       }
-       
+               add_err_string != NULL ? add_err_string : ldb_strerror(ldb_err));
+
        /* result is 1:1 for now */
        return ldb_err;
 }
@@ -316,6 +301,11 @@ static int ldapsrv_add_with_controls(struct ldapsrv_call *call,
 
        if (ret != LDB_SUCCESS) return ret;
 
+       if (call->conn->global_catalog) {
+               return ldb_error(ldb, LDB_ERR_UNWILLING_TO_PERFORM, "modify forbidden on global catalog port");
+       }
+       ldb_request_add_control(req, DSDB_CONTROL_NO_GLOBAL_CATALOG, false, NULL);
+
        ret = ldb_transaction_start(ldb);
        if (ret != LDB_SUCCESS) {
                return ret;
@@ -369,6 +359,11 @@ static int ldapsrv_mod_with_controls(struct ldapsrv_call *call,
                return ret;
        }
 
+       if (call->conn->global_catalog) {
+               return ldb_error(ldb, LDB_ERR_UNWILLING_TO_PERFORM, "modify forbidden on global catalog port");
+       }
+       ldb_request_add_control(req, DSDB_CONTROL_NO_GLOBAL_CATALOG, false, NULL);
+
        ret = ldb_transaction_start(ldb);
        if (ret != LDB_SUCCESS) {
                return ret;
@@ -415,6 +410,11 @@ static int ldapsrv_del_with_controls(struct ldapsrv_call *call,
 
        if (ret != LDB_SUCCESS) return ret;
 
+       if (call->conn->global_catalog) {
+               return ldb_error(ldb, LDB_ERR_UNWILLING_TO_PERFORM, "modify forbidden on global catalog port");
+       }
+       ldb_request_add_control(req, DSDB_CONTROL_NO_GLOBAL_CATALOG, false, NULL);
+
        ret = ldb_transaction_start(ldb);
        if (ret != LDB_SUCCESS) {
                return ret;
@@ -462,6 +462,11 @@ static int ldapsrv_rename_with_controls(struct ldapsrv_call *call,
 
        if (ret != LDB_SUCCESS) return ret;
 
+       if (call->conn->global_catalog) {
+               return ldb_error(ldb, LDB_ERR_UNWILLING_TO_PERFORM, "modify forbidden on global catalog port");
+       }
+       ldb_request_add_control(req, DSDB_CONTROL_NO_GLOBAL_CATALOG, false, NULL);
+
        ret = ldb_transaction_start(ldb);
        if (ret != LDB_SUCCESS) {
                return ret;
@@ -521,7 +526,7 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
        NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
        basedn = ldb_dn_new(local_ctx, samdb, req->basedn);
-       VALID_DN_SYNTAX(basedn);
+       NT_STATUS_HAVE_NO_MEMORY(basedn);
 
        DEBUG(10, ("SearchRequest: basedn: [%s]\n", req->basedn));
        DEBUG(10, ("SearchRequest: filter: [%s]\n", ldb_filter_from_tree(call, req->tree)));
@@ -593,6 +598,8 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
                        search_options->search_options = LDB_SEARCH_OPTION_PHANTOM_ROOT;
                        ldb_request_add_control(lreq, LDB_CONTROL_SEARCH_OPTIONS_OID, false, search_options);
                }
+       } else {
+               ldb_request_add_control(lreq, DSDB_CONTROL_NO_GLOBAL_CATALOG, false, NULL);
        }
 
        extended_dn_control = ldb_request_get_control(lreq, LDB_CONTROL_EXTENDED_DN_OID);
@@ -735,7 +742,7 @@ static NTSTATUS ldapsrv_ModifyRequest(struct ldapsrv_call *call)
        NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
        dn = ldb_dn_new(local_ctx, samdb, req->dn);
-       VALID_DN_SYNTAX(dn);
+       NT_STATUS_HAVE_NO_MEMORY(dn);
 
        DEBUG(10, ("ModifyRequest: dn: [%s]\n", req->dn));
 
@@ -843,7 +850,7 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
        NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
        dn = ldb_dn_new(local_ctx, samdb, req->dn);
-       VALID_DN_SYNTAX(dn);
+       NT_STATUS_HAVE_NO_MEMORY(dn);
 
        DEBUG(10, ("AddRequest: dn: [%s]\n", req->dn));
 
@@ -879,7 +886,6 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
                }
        }
 
-reply:
        add_reply = ldapsrv_init_reply(call, LDAP_TAG_AddResponse);
        NT_STATUS_HAVE_NO_MEMORY(add_reply);
 
@@ -931,11 +937,10 @@ static NTSTATUS ldapsrv_DelRequest(struct ldapsrv_call *call)
        NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
        dn = ldb_dn_new(local_ctx, samdb, req->dn);
-       VALID_DN_SYNTAX(dn);
+       NT_STATUS_HAVE_NO_MEMORY(dn);
 
        DEBUG(10, ("DelRequest: dn: [%s]\n", req->dn));
 
-reply:
        del_reply = ldapsrv_init_reply(call, LDAP_TAG_DelResponse);
        NT_STATUS_HAVE_NO_MEMORY(del_reply);
 
@@ -989,10 +994,10 @@ static NTSTATUS ldapsrv_ModifyDNRequest(struct ldapsrv_call *call)
        NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
        olddn = ldb_dn_new(local_ctx, samdb, req->dn);
-       VALID_DN_SYNTAX(olddn);
+       NT_STATUS_HAVE_NO_MEMORY(olddn);
 
        newrdn = ldb_dn_new(local_ctx, samdb, req->newrdn);
-       VALID_DN_SYNTAX(newrdn);
+       NT_STATUS_HAVE_NO_MEMORY(newrdn);
 
        DEBUG(10, ("ModifyDNRequest: olddn: [%s]\n", req->dn));
        DEBUG(10, ("ModifyDNRequest: newrdn: [%s]\n", req->newrdn));
@@ -1022,9 +1027,8 @@ static NTSTATUS ldapsrv_ModifyDNRequest(struct ldapsrv_call *call)
        }
 
        if (req->newsuperior) {
-               parentdn = ldb_dn_new(local_ctx, samdb, req->newsuperior);
-               VALID_DN_SYNTAX(parentdn);
                DEBUG(10, ("ModifyDNRequest: newsuperior: [%s]\n", req->newsuperior));
+               parentdn = ldb_dn_new(local_ctx, samdb, req->newsuperior);
        }
 
        if (!parentdn) {
@@ -1097,7 +1101,7 @@ static NTSTATUS ldapsrv_CompareRequest(struct ldapsrv_call *call)
        NT_STATUS_HAVE_NO_MEMORY(local_ctx);
 
        dn = ldb_dn_new(local_ctx, samdb, req->dn);
-       VALID_DN_SYNTAX(dn);
+       NT_STATUS_HAVE_NO_MEMORY(dn);
 
        DEBUG(10, ("CompareRequest: dn: [%s]\n", req->dn));
        filter = talloc_asprintf(local_ctx, "(%s=%*s)", req->attribute, 
@@ -1108,7 +1112,6 @@ static NTSTATUS ldapsrv_CompareRequest(struct ldapsrv_call *call)
 
        attrs[0] = NULL;
 
-reply:
        compare_r = ldapsrv_init_reply(call, LDAP_TAG_CompareResponse);
        NT_STATUS_HAVE_NO_MEMORY(compare_r);
 
@@ -1159,6 +1162,9 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
 {
        unsigned int i;
        struct ldap_message *msg = call->request;
+       struct ldb_context *samdb = call->conn->ldb;
+       NTSTATUS status;
+       time_t *lastts;
        /* Check for undecoded critical extensions */
        for (i=0; msg->controls && msg->controls[i]; i++) {
                if (!msg->controls_decoded[i] && 
@@ -1177,9 +1183,11 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
        case LDAP_TAG_SearchRequest:
                return ldapsrv_SearchRequest(call);
        case LDAP_TAG_ModifyRequest:
-               return ldapsrv_ModifyRequest(call);
+               status = ldapsrv_ModifyRequest(call);
+               break;
        case LDAP_TAG_AddRequest:
-               return ldapsrv_AddRequest(call);
+               status = ldapsrv_AddRequest(call);
+               break;
        case LDAP_TAG_DelRequest:
                return ldapsrv_DelRequest(call);
        case LDAP_TAG_ModifyDNRequest:
@@ -1193,4 +1201,20 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
        default:
                return ldapsrv_unwilling(call, LDAP_PROTOCOL_ERROR);
        }
+
+       if (NT_STATUS_IS_OK(status)) {
+               lastts = (time_t *)ldb_get_opaque(samdb, DSDB_OPAQUE_LAST_SCHEMA_UPDATE_MSG_OPAQUE_NAME);
+               if (lastts && !*lastts) {
+                       DEBUG(10, ("Schema update now was requested, fullfilling the request ts = %d\n", lastts));
+                       /*
+                       * Just requesting the schema will do the trick
+                       * as the delay for reload is experied, we will have a reload
+                       * from the schema as expected as we are not yet in a transaction!
+                       */
+                       dsdb_get_schema(samdb, NULL);
+                       *lastts = time(NULL);
+                       ldb_set_opaque(samdb, DSDB_OPAQUE_LAST_SCHEMA_UPDATE_MSG_OPAQUE_NAME, lastts);
+               }
+       }
+       return status;
 }
ddiss' public Samba repository