werror: replace WERR_NOMEM with WERR_NOT_ENOUGH_MEMORY in source4/dsdb/

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index 090cf1b9cc9af7b662505a23471985e22586dc82..9266e75d2cdfc918b1303c3fb342808ba4b29316 100644 (file)
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -43,7 +43,7 @@ static WERROR kccsrv_init_creds(struct kccsrv_service *service)
 {
        service->system_session_info = system_session(service->task->lp_ctx);
        if (!service->system_session_info) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        return WERR_OK;

diff --git a/source4/dsdb/repl/drepl_extended.c b/source4/dsdb/repl/drepl_extended.c
index 8735005941b1635e1d4caab5a84878d30313c3fb..de53028b7a4613aa172522a5d5e16f1ab49cb31b 100644 (file)
--- a/source4/dsdb/repl/drepl_extended.c
+++ b/source4/dsdb/repl/drepl_extended.c
@@ -58,18 +58,18 @@ static WERROR drepl_create_extended_source_dsa(struct dreplsrv_service *service,
        sdsa->partition = talloc_zero(sdsa, struct dreplsrv_partition);
        if (!sdsa->partition) {
                talloc_free(sdsa);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        sdsa->partition->dn = ldb_dn_copy(sdsa->partition, nc_dn);
        if (!sdsa->partition->dn) {
                talloc_free(sdsa);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        sdsa->partition->nc.dn = ldb_dn_alloc_linearized(sdsa->partition, nc_dn);
        if (!sdsa->partition->nc.dn) {
                talloc_free(sdsa);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        ret = dsdb_find_guid_by_dn(ldb, nc_dn, &sdsa->partition->nc.guid);
        if (ret != LDB_SUCCESS) {
@@ -91,7 +91,7 @@ static WERROR drepl_create_extended_source_dsa(struct dreplsrv_service *service,
        sdsa->repsFrom1->other_info = talloc_zero(sdsa, struct repsFromTo1OtherInfo);
        if (!sdsa->repsFrom1->other_info) {
                talloc_free(sdsa);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        sdsa->repsFrom1->other_info->dns_name = samdb_ntds_msdcs_dns_name(ldb,
@@ -99,7 +99,7 @@ static WERROR drepl_create_extended_source_dsa(struct dreplsrv_service *service,
                                                                          &sdsa->repsFrom1->source_dsa_obj_guid);
        if (!sdsa->repsFrom1->other_info->dns_name) {
                talloc_free(sdsa);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        werr = dreplsrv_out_connection_attach(service, sdsa->repsFrom1, &sdsa->conn);

diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c
index 2da2673862652e440745fee9d0a969783b340e91..8af64124e8932b850c48b8bc503e426a7191cbb3 100644 (file)
--- a/source4/dsdb/repl/drepl_out_pull.c
+++ b/source4/dsdb/repl/drepl_out_pull.c
@@ -117,7 +117,7 @@ WERROR dreplsrv_schedule_partition_pull_source(struct dreplsrv_service *s,
         */
        op->source_dsa  = talloc_reference(op, source);
        if (!op->source_dsa) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        op->options     = options;
@@ -233,7 +233,7 @@ void dreplsrv_run_pull_ops(struct dreplsrv_service *s)
 
        subreq = dreplsrv_op_pull_source_send(op, s->task->event_ctx, op);
        if (!subreq) {
-               werr = WERR_NOMEM;
+               werr = WERR_NOT_ENOUGH_MEMORY;
                goto failed;
        }
 

diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 2176da2d53d988295479181497644adae12371c9..e8476e54cd0da73a672f0b2548a8cc7de4e0b70c 100644 (file)
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -54,7 +54,7 @@ static WERROR dreplsrv_init_creds(struct dreplsrv_service *service)
 {
        service->system_session_info = system_session(service->task->lp_ctx);
        if (service->system_session_info == NULL) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        return WERR_OK;

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 46b0b666ad49ebc991dd2ede12ebd90189ef372b..637f7fafbab99b297698323cb078e5f44a2f5903 100644 (file)
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -60,7 +60,7 @@ static WERROR dsdb_repl_merge_working_schema(struct ldb_context *ldb,
                 */
                tmp2 = talloc(dest_schema, struct dsdb_class);
                if (tmp2 == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                *tmp2 = *cur_class;
                DLIST_ADD(dest_schema->classes, tmp2);
@@ -87,7 +87,7 @@ static WERROR dsdb_repl_merge_working_schema(struct ldb_context *ldb,
                 */
                tmp2 = talloc(dest_schema, struct dsdb_attribute);
                if (tmp2 == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                *tmp2 = *cur_attr;
                DLIST_ADD(dest_schema->attributes, tmp2);
@@ -134,7 +134,7 @@ WERROR dsdb_repl_resolve_working_schema(struct ldb_context *ldb,
        for (cur = first_object; cur; cur = cur->next_object) {
                schema_list_item = talloc(frame, struct schema_list);
                if (schema_list_item == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                schema_list_item->obj = cur;
@@ -298,7 +298,7 @@ WERROR dsdb_repl_make_working_schema(struct ldb_context *ldb,
        working_schema = dsdb_schema_copy_shallow(mem_ctx, ldb, initial_schema);
        if (!working_schema) {
                DEBUG(0,(__location__ ": schema copy failed!\n"));
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        working_schema->resolving_in_progress = true;
 
@@ -832,7 +832,7 @@ WERROR dsdb_replicated_objects_commit(struct ldb_context *ldb,
        TALLOC_CTX *tmp_ctx = talloc_new(objects);
        if (!tmp_ctx) {
                DEBUG(0,("Failed to start talloc\n"));
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* TODO: handle linked attributes */
@@ -1104,7 +1104,7 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
        objects = talloc_array(mem_ctx, struct ldb_message *,
                               num_objects);
        if (objects == NULL) {
-               status = WERR_NOMEM;
+               status = WERR_NOT_ENOUGH_MEMORY;
                goto cancel;
        }
 
@@ -1125,7 +1125,7 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
                           struct drsuapi_DsReplicaObjectIdentifier2,
                           num_objects);
        if (ids == NULL) {
-               status = WERR_NOMEM;
+               status = WERR_NOT_ENOUGH_MEMORY;
                goto cancel;
        }
 

diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index ae334b4a60e06f6e74bc327ed5e7ce1768af42da..0e87fe0b29c3356063ebee8287c8c35c954957b3 100644 (file)
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -198,7 +198,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                DEBUG(2, ("Could not parse principal: %s: %s\n",
                          name, smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
                                                           ret, mem_ctx)));
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* grab cifs/, http/ etc */
@@ -226,7 +226,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                info1->status           = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
                info1->dns_domain_name  = talloc_strdup(mem_ctx, dns_name);
                if (!info1->dns_domain_name) {
-                       wret = WERR_NOMEM;
+                       wret = WERR_NOT_ENOUGH_MEMORY;
                }
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                return wret;
@@ -240,7 +240,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
        new_princ = talloc_asprintf(mem_ctx, "%s/%s", new_service, dns_name);
        if (!new_princ) {
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        wret = DsCrackNameOneName(sam_ctx, mem_ctx, format_flags, format_offered, format_desired,
@@ -250,7 +250,7 @@ static WERROR DsCrackNameSPNAlias(struct ldb_context *sam_ctx, TALLOC_CTX *mem_c
                info1->status           = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
                info1->dns_domain_name  = talloc_strdup(mem_ctx, dns_name);
                if (!info1->dns_domain_name) {
-                       wret = WERR_NOMEM;
+                       wret = WERR_NOT_ENOUGH_MEMORY;
                }
        }
        krb5_free_principal(smb_krb5_context->krb5_context, principal);
@@ -337,7 +337,7 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 
        if (ret) {
                free(unparsed_name_short);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* This may need to be extended for more userPrincipalName variations */
@@ -348,7 +348,7 @@ static WERROR DsCrackNameUPN(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 
        if (!result_filter || !domain_filter) {
                free(unparsed_name_short);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        status = DsCrackNameOneFilter(sam_ctx, mem_ctx, 
                                      smb_krb5_context, 
@@ -629,7 +629,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 
                ldap_guid = ldap_encode_ndr_GUID(mem_ctx, &guid);
                if (!ldap_guid) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                result_filter = talloc_asprintf(mem_ctx, "(objectGUID=%s)",
                                                ldap_guid);
@@ -660,7 +660,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                ldap_sid = ldap_encode_ndr_dom_sid(mem_ctx, 
                                                   sid);
                if (!ldap_sid) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                result_filter = talloc_asprintf(mem_ctx, "(objectSid=%s)",
                                                ldap_sid);
@@ -676,7 +676,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                            &smb_krb5_context);
 
                if (ret) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                /* Ensure we reject compleate junk first */
@@ -702,7 +702,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                              &unparsed_name);
                if (ret) {
                        krb5_free_principal(smb_krb5_context->krb5_context, principal);
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                krb5_free_principal(smb_krb5_context->krb5_context, principal);
@@ -726,7 +726,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                            &smb_krb5_context);
 
                if (ret) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                ret = krb5_parse_name(smb_krb5_context->krb5_context, name, &principal);
@@ -752,7 +752,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                              KRB5_PRINCIPAL_UNPARSE_NO_REALM, &unparsed_name_short);
                if (ret) {
                        krb5_free_principal(smb_krb5_context->krb5_context, principal);
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
 
                component = krb5_princ_component(smb_krb5_context->krb5_context,
@@ -771,7 +771,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                        if (computer_name == NULL) {
                                krb5_free_principal(smb_krb5_context->krb5_context, principal);
                                free(unparsed_name_short);
-                               return WERR_NOMEM;
+                               return WERR_NOT_ENOUGH_MEMORY;
                        }
 
                        result_filter = talloc_asprintf(mem_ctx, "(|(&(servicePrincipalName=%s)(objectClass=user))(&(cn=%s)(objectClass=computer)))", 
@@ -836,7 +836,7 @@ static WERROR DsCrackNameOneSyntactical(TALLOC_CTX *mem_ctx,
        info1->status = DRSUAPI_DS_NAME_STATUS_OK;
        info1->result_name      = cracked;
        if (!cracked) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        return WERR_OK; 

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 7a5906eb86b7f4528181bfe9eaaa051205473ba2..4a666972ce2bc9f7dede73a29a91eadcee5b1b81 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -4655,7 +4655,7 @@ static int replmd_replicated_apply_search_for_parent(struct replmd_replicated_re
                                  &guid_str_buf);
 
        filter = talloc_asprintf(ar, "(objectGUID=%s)", tmp_str);
-       if (!filter) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+       if (!filter) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
 
        ret = ldb_build_search_req(&search_req,
                                   ldb,
@@ -4820,7 +4820,7 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar,
                                                                  "Failed to form conflict DN for %s\n",
                                                                  ldb_dn_get_linearized(msg->dn));
 
-                       return replmd_replicated_request_werror(ar, WERR_NOMEM);
+                       return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
                }
 
                ret = dsdb_module_rename(ar->module, ar->search_msg->dn, new_dn,
@@ -5048,7 +5048,7 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
        nmd.ctr.ctr1.array = talloc_array(ar,
                                          struct replPropertyMetaData1,
                                          nmd.ctr.ctr1.count);
-       if (!nmd.ctr.ctr1.array) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+       if (!nmd.ctr.ctr1.array) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
 
        /* first copy the old meta data */
        for (i=0; i < omd.ctr.ctr1.count; i++) {
@@ -5482,7 +5482,7 @@ static int replmd_replicated_apply_next(struct replmd_replicated_request *ar)
                                  &guid_str_buf);
 
        filter = talloc_asprintf(ar, "(objectGUID=%s)", tmp_str);
-       if (!filter) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+       if (!filter) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
 
        ret = ldb_build_search_req(&search_req,
                                   ldb,
@@ -5688,7 +5688,7 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
        nuv.ctr.ctr2.cursors = talloc_array(ar,
                                            struct drsuapi_DsReplicaCursor2,
                                            nuv.ctr.ctr2.count);
-       if (!nuv.ctr.ctr2.cursors) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+       if (!nuv.ctr.ctr2.cursors) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
 
        /* first copy the old vector */
        for (i=0; i < ouv.ctr.ctr2.count; i++) {
@@ -5740,7 +5740,7 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
         * create the change ldb_message
         */
        msg = ldb_msg_new(ar);
-       if (!msg) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+       if (!msg) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
        msg->dn = ar->search_msg->dn;
 
        ndr_err = ndr_push_struct_blob(&nuv_value, msg, &nuv,
@@ -5775,7 +5775,7 @@ static int replmd_replicated_uptodate_modify(struct replmd_replicated_request *a
                        struct repsFromToBlob *trf;
 
                        trf = talloc(ar, struct repsFromToBlob);
-                       if (!trf) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+                       if (!trf) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
 
                        ndr_err = ndr_pull_struct_blob(&orf_el->values[i], trf, trf,
                                                       (ndr_pull_flags_fn_t)ndr_pull_repsFromToBlob);
@@ -5988,7 +5988,7 @@ static int replmd_extended_replicated_objects(struct ldb_module *module, struct
        if (req->controls) {
                req->controls = talloc_memdup(ar, req->controls,
                                              talloc_get_size(req->controls));
-               if (!req->controls) return replmd_replicated_request_werror(ar, WERR_NOMEM);
+               if (!req->controls) return replmd_replicated_request_werror(ar, WERR_NOT_ENOUGH_MEMORY);
        }
 
        ret = ldb_request_add_control(req, DSDB_CONTROL_REPLICATED_UPDATE_OID, false, NULL);

diff --git a/source4/dsdb/schema/schema_info_attr.c b/source4/dsdb/schema/schema_info_attr.c
index 0d5401265bc9dcd0c25e04b29b4e5dbee4519c5a..dd06f9b2fbcdfffda6be1a93a8071962bfaece13 100644 (file)
--- a/source4/dsdb/schema/schema_info_attr.c
+++ b/source4/dsdb/schema/schema_info_attr.c
@@ -125,7 +125,7 @@ WERROR dsdb_schema_info_from_blob(const DATA_BLOB *blob,
        schema_info = talloc(mem_ctx, struct dsdb_schema_info);
        if (!schema_info) {
                talloc_free(temp_ctx);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* note that we accept revision numbers of zero now - w2k8r2

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index 3fac3c13b84c29f9349d340d443795f61d48a65c..ce78800c58b6bef615b001060a798565dd0396ad 100644 (file)
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -387,7 +387,7 @@ WERROR dsdb_write_prefixes_from_schema_to_ldb(TALLOC_CTX *mem_ctx, struct ldb_co
        msg = ldb_msg_new(temp_ctx);
        if (!msg) {
                talloc_free(temp_ctx);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        msg->dn = schema_dn;
@@ -395,7 +395,7 @@ WERROR dsdb_write_prefixes_from_schema_to_ldb(TALLOC_CTX *mem_ctx, struct ldb_co
        if (ldb_ret != 0) {
                talloc_free(temp_ctx);
                DEBUG(0,("dsdb_write_prefixes_from_schema_to_ldb: ldb_msg_add_value failed\n"));        
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
  
        ldb_ret = dsdb_replace(ldb, msg, DSDB_FLAG_AS_SYSTEM);
@@ -534,7 +534,7 @@ static int dsdb_schema_setup_ldb_schema_attribute(struct ldb_context *ldb,
                                           get_string_val->length); \
                if (!(p)->elem) {                                       \
                        d_printf("%s: talloc_strndup failed for %s\n", __location__, attr); \
-                       return WERR_NOMEM;                              \
+                       return WERR_NOT_ENOUGH_MEMORY;                          \
                }                                                       \
        }                                                               \
 } while (0)
@@ -556,7 +556,7 @@ static int dsdb_schema_setup_ldb_schema_attribute(struct ldb_context *ldb,
                                                                    get_string_list_el->values[get_string_list_counter].length); \
                if (!(p)->elem[get_string_list_counter]) {              \
                        d_printf("%s: talloc_strndup failed for %s\n", __location__, attr); \
-                       return WERR_NOMEM;                              \
+                       return WERR_NOT_ENOUGH_MEMORY;                          \
                }                                                       \
                (p)->elem[get_string_list_counter+1] = NULL;            \
        }                                                               \
@@ -599,7 +599,7 @@ static int dsdb_schema_setup_ldb_schema_attribute(struct ldb_context *ldb,
                (p)->elem = talloc(mem_ctx, uint32_t); \
                if (!(p)->elem) { \
                        d_printf("%s: talloc failed for %s\n", __location__, attr); \
-                       return WERR_NOMEM; \
+                       return WERR_NOT_ENOUGH_MEMORY; \
                } \
                *(p)->elem = (uint32_t)_v; \
        } \
@@ -720,7 +720,7 @@ WERROR dsdb_set_attribute_from_ldb_dups(struct ldb_context *ldb,
        WERROR status;
        struct dsdb_attribute *attr = talloc_zero(schema, struct dsdb_attribute);
        if (!attr) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        status = dsdb_attribute_from_ldb(schema, msg, attr);
@@ -758,7 +758,7 @@ WERROR dsdb_set_attribute_from_ldb_dups(struct ldb_context *ldb,
                a = talloc_realloc(schema, schema->attributes_to_remove,
                                   struct dsdb_attribute *, i + 1);
                if (a == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                /* Mark the old attribute as to be removed */
                a[i] = discard_const_p(struct dsdb_attribute, a2);
@@ -785,7 +785,7 @@ WERROR dsdb_set_class_from_ldb_dups(struct dsdb_schema *schema,
        WERROR status;
        struct dsdb_class *obj = talloc_zero(schema, struct dsdb_class);
        if (!obj) {
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        GET_STRING_LDB(msg, "cn", obj, obj, cn, false);
 
@@ -862,7 +862,7 @@ WERROR dsdb_set_class_from_ldb_dups(struct dsdb_schema *schema,
                c = talloc_realloc(schema, schema->classes_to_remove,
                                   struct dsdb_class *, i + 1);
                if (c == NULL) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                /* Mark the old class to be removed */
                c[i] = discard_const_p(struct dsdb_class, c2);

diff --git a/source4/dsdb/schema/schema_prefixmap.c b/source4/dsdb/schema/schema_prefixmap.c
index dc4e617e29c599b42e1fc74aae369580b3c1fcab..c30aecc0ec265eec5e5cf76a956badc4be6e4340 100644 (file)
--- a/source4/dsdb/schema/schema_prefixmap.c
+++ b/source4/dsdb/schema/schema_prefixmap.c
@@ -165,7 +165,7 @@ WERROR dsdb_schema_pfm_add_entry(struct dsdb_schema_prefixmap *pfm,
        prefixes_new = talloc_realloc(pfm, pfm->prefixes, struct dsdb_schema_prefixmap_oid, pfm->length + 1);
        if (!prefixes_new) {
                talloc_free(bin_oid.data);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
        pfm->prefixes = prefixes_new;
 
@@ -571,7 +571,7 @@ WERROR dsdb_schema_pfm_from_drsuapi_pfm(const struct drsuapi_DsReplicaOIDMapping
                                        ctr->mappings[i].oid.length);
                if (!blob.data) {
                        talloc_free(pfm);
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                pfm->prefixes[i].id = ctr->mappings[i].id_prefix;
                pfm->prefixes[i].bin_oid = blob;
@@ -633,7 +633,7 @@ WERROR dsdb_drsuapi_pfm_from_schema_pfm(const struct dsdb_schema_prefixmap *pfm,
        ctr->mappings = talloc_array(ctr, struct drsuapi_DsReplicaOIDMapping, ctr->num_mappings);
        if (!ctr->mappings) {
                talloc_free(ctr);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        /* copy entries from schema_prefixMap */
@@ -641,7 +641,7 @@ WERROR dsdb_drsuapi_pfm_from_schema_pfm(const struct dsdb_schema_prefixmap *pfm,
                blob = data_blob_dup_talloc(ctr, pfm->prefixes[i].bin_oid);
                if (!blob.data) {
                        talloc_free(ctr);
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                ctr->mappings[i].id_prefix = pfm->prefixes[i].id;
                ctr->mappings[i].oid.length = blob.length;

diff --git a/source4/dsdb/schema/schema_query.c b/source4/dsdb/schema/schema_query.c
index ad3e03f1aced9c4c0c676b71e95b7a7f0a778933..3860d373eea120c7e7d6c7e1f4cd47a02fed6a7c 100644 (file)
--- a/source4/dsdb/schema/schema_query.c
+++ b/source4/dsdb/schema/schema_query.c
@@ -225,7 +225,7 @@ WERROR dsdb_linked_attribute_lDAPDisplayName_list(const struct dsdb_schema *sche
                
                attr_list = talloc_realloc(mem_ctx, attr_list, const char *, i+2);
                if (!attr_list) {
-                       return WERR_NOMEM;
+                       return WERR_NOT_ENOUGH_MEMORY;
                }
                attr_list[i] = cur->lDAPDisplayName;
                i++;

diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index a404e0acdfc6f39278df5d6910b6cdef31bf461a..2400c8c8f38a6b7cf511dbdee63bc673186c2707 100644 (file)
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -894,7 +894,7 @@ WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb,
        goto done;
 
 nomem:
-       status = WERR_NOMEM;
+       status = WERR_NOT_ENOUGH_MEMORY;
 failed:
 done:
        talloc_free(mem_ctx);

diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 2e85a4ef02ca73d852b5fd6c5ca7d052224013e6..fe99ad1681e0e2d52a1b7173c3ce9bc83973db03 100644 (file)
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -1862,7 +1862,7 @@ static WERROR dsdb_syntax_DN_validate_one_val(const struct dsdb_syntax_ctx *ctx,
        dn2 = ldb_dn_copy(tmp_ctx, dn);
        if (dn == NULL) {
                talloc_free(tmp_ctx);
-               return WERR_NOMEM;
+               return WERR_NOT_ENOUGH_MEMORY;
        }
 
        num_components = ldb_dn_get_comp_num(dn);