diff options
| -rw-r--r-- | source4/dsdb/common/util.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/common/util_samr.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 2 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbdel.c | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbedit.c | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbrename.c | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbsearch.c | 5 | ||||
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 |
9 files changed, 14 insertions, 18 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index d0efa057e7b..2563b40ebdb 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -3761,9 +3761,9 @@ int dsdb_search_by_dn_guid(struct ldb_context *ldb, int ret; dn = ldb_dn_new_fmt(tmp_ctx, ldb, "<GUID=%s>", GUID_string(tmp_ctx, guid)); - if (!ldb_dn_validate(dn)) { + if (dn == NULL) { talloc_free(tmp_ctx); - return LDB_ERR_INVALID_DN_SYNTAX; + return ldb_oom(ldb); } ret = dsdb_search_dn(ldb, mem_ctx, _res, dn, attrs, dsdb_flags); diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c index deaea2e07fa..7a4f6441236 100644 --- a/source4/dsdb/common/util_samr.c +++ b/source4/dsdb/common/util_samr.c @@ -507,7 +507,7 @@ NTSTATUS dsdb_lookup_rids(struct ldb_context *ldb, dom_sid_string(tmp_ctx, dom_sid_add_rid(tmp_ctx, domain_sid, rids[i]))); - if (!dn || !ldb_dn_validate(dn)) { + if (dn == NULL) { talloc_free(tmp_ctx); return NT_STATUS_NO_MEMORY; } diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index be60d896387..30fa4d9c519 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -103,7 +103,7 @@ static int expand_dn_in_message(struct ldb_module *module, struct ldb_message *m } dn = ldb_dn_new(tmp_ctx, ldb, dn_string); - if (!ldb_dn_validate(dn)) { + if (dn == NULL) { talloc_free(tmp_ctx); return ldb_operr(ldb); } diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index cd90b47b45c..adcf7bc71d7 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -175,7 +175,7 @@ static int ldapsrv_load_limits(struct ldapsrv_connection *conn) } basedn = ldb_dn_new(tmp_ctx, conn->ldb, NULL); - if ( ! ldb_dn_validate(basedn)) { + if (basedn == NULL) { goto failed; } diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c index 35d01377083..8036d09a70d 100644 --- a/source4/lib/ldb/tools/ldbdel.c +++ b/source4/lib/ldb/tools/ldbdel.c @@ -110,9 +110,8 @@ int main(int argc, const char **argv) struct ldb_dn *dn; dn = ldb_dn_new(ldb, ldb, options->argv[i]); - if ( ! ldb_dn_validate(dn)) { - printf("Invalid DN format\n"); - return LDB_ERR_INVALID_DN_SYNTAX; + if (dn == NULL) { + return LDB_ERR_OPERATIONS_ERROR; } if (options->recursive) { ret = ldb_delete_recursive(ldb, dn,req_ctrls); diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index 8df37060c65..36d054e5639 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -326,9 +326,8 @@ int main(int argc, const char **argv) if (options->basedn != NULL) { basedn = ldb_dn_new(ldb, ldb, options->basedn); - if ( ! ldb_dn_validate(basedn)) { - printf("Invalid Base DN format\n"); - return LDB_ERR_INVALID_DN_SYNTAX; + if (basedn == NULL) { + return LDB_ERR_OPERATIONS_ERROR; } } diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c index e8f67500fc6..9bbd1f06b1a 100644 --- a/source4/lib/ldb/tools/ldbrename.c +++ b/source4/lib/ldb/tools/ldbrename.c @@ -66,9 +66,8 @@ int main(int argc, const char **argv) dn1 = ldb_dn_new(ldb, ldb, options->argv[0]); dn2 = ldb_dn_new(ldb, ldb, options->argv[1]); - if ((!ldb_dn_validate(dn1)) || (!ldb_dn_validate(dn2))) { - printf("Invalid DN format(s)\n"); - return LDB_ERR_INVALID_DN_SYNTAX; + if ((dn1 == NULL) || (dn2 == NULL)) { + return LDB_ERR_OPERATIONS_ERROR; } ret = ldb_rename(ldb, dn1, dn2); diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index 8c101719a3b..d10b9650daf 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -297,9 +297,8 @@ int main(int argc, const char **argv) if (options->basedn != NULL) { basedn = ldb_dn_new(ldb, ldb, options->basedn); - if ( ! ldb_dn_validate(basedn)) { - fprintf(stderr, "Invalid Base DN format\n"); - return LDB_ERR_INVALID_DN_SYNTAX; + if (basedn == NULL) { + return LDB_ERR_OPERATIONS_ERROR; } } diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 715f21b9895..6e76df43e3d 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -236,7 +236,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J } account_dn = ldb_dn_new(tmp_ctx, remote_ldb, account_dn_str); - if (! ldb_dn_validate(account_dn)) { + if (account_dn == NULL) { r->out.error_string = talloc_asprintf(r, "Invalid account dn: %s", account_dn_str); talloc_free(tmp_ctx); |