summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-04-29 11:48:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:14 -0500
commit657325d684b838ee7dd6379a4a6034c1fedabcae (patch)
tree1cdb644eee717fbdb46bf4e660801f0c896cd960 /source4/dsdb
parenta3b8cfbc8f5b18a342dee79fd9928cbcc2fbb025 (diff)
downloadsamba-657325d684b838ee7dd6379a4a6034c1fedabcae.tar.gz
samba-657325d684b838ee7dd6379a4a6034c1fedabcae.tar.bz2
samba-657325d684b838ee7dd6379a4a6034c1fedabcae.zip
r15319: remove unneeded macros
metze (This used to be commit 9611c8aa9ce0eba1703d5eecc52e67a9e5fba15f)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/cracknames.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 2b9e7e31f7..7d6fe70248 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -303,7 +303,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
char *str;
str = talloc_strdup(mem_ctx, name);
- WERR_TALLOC_CHECK(str);
+ W_ERROR_HAVE_NO_MEMORY(str);
if (strlen(str) == 0 || str[strlen(str)-1] != '/') {
info1->status = DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR;
@@ -315,7 +315,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
domain_filter = talloc_asprintf(mem_ctx,
"(&(&(&(dnsRoot=%s)(objectclass=crossRef)))(nETBIOSName=*)(ncName=*))",
ldb_binary_encode_string(mem_ctx, str));
- WERR_TALLOC_CHECK(domain_filter);
+ W_ERROR_HAVE_NO_MEMORY(domain_filter);
break;
}
@@ -325,7 +325,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
const char *account = NULL;
domain = talloc_strdup(mem_ctx, name);
- WERR_TALLOC_CHECK(domain);
+ W_ERROR_HAVE_NO_MEMORY(domain);
p = strchr(domain, '\\');
if (!p) {
@@ -342,11 +342,11 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
domain_filter = talloc_asprintf(mem_ctx,
"(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))",
ldb_binary_encode_string(mem_ctx, domain));
- WERR_TALLOC_CHECK(domain_filter);
+ W_ERROR_HAVE_NO_MEMORY(domain_filter);
if (account) {
result_filter = talloc_asprintf(mem_ctx, "(sAMAccountName=%s)",
ldb_binary_encode_string(mem_ctx, account));
- WERR_TALLOC_CHECK(result_filter);
+ W_ERROR_HAVE_NO_MEMORY(result_filter);
}
talloc_free(domain);
@@ -383,7 +383,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
}
result_filter = talloc_asprintf(mem_ctx, "(objectGUID=%s)",
ldap_guid);
- WERR_TALLOC_CHECK(result_filter);
+ W_ERROR_HAVE_NO_MEMORY(result_filter);
break;
}
case DRSUAPI_DS_NAME_FORMAT_DISPLAY: {
@@ -392,7 +392,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
result_filter = talloc_asprintf(mem_ctx, "(|(displayName=%s)(samAccountName=%s))",
ldb_binary_encode_string(mem_ctx, name),
ldb_binary_encode_string(mem_ctx, name));
- WERR_TALLOC_CHECK(result_filter);
+ W_ERROR_HAVE_NO_MEMORY(result_filter);
break;
}
@@ -413,7 +413,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
}
result_filter = talloc_asprintf(mem_ctx, "(objectSid=%s)",
ldap_sid);
- WERR_TALLOC_CHECK(result_filter);
+ W_ERROR_HAVE_NO_MEMORY(result_filter);
break;
}
case DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL: {
@@ -438,7 +438,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
ldb_binary_encode_string(mem_ctx, unparsed_name));
free(unparsed_name);
- WERR_TALLOC_CHECK(result_filter);
+ W_ERROR_HAVE_NO_MEMORY(result_filter);
break;
}
case DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL: {
@@ -461,7 +461,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
info1->dns_domain_name = talloc_strdup(info1, *realm);
krb5_free_principal(smb_krb5_context->krb5_context, principal);
- WERR_TALLOC_CHECK(info1->dns_domain_name);
+ W_ERROR_HAVE_NO_MEMORY(info1->dns_domain_name);
info1->status = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
return WERR_OK;
@@ -498,7 +498,7 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
}
krb5_free_principal(smb_krb5_context->krb5_context, principal);
free(unparsed_name_short);
- WERR_TALLOC_CHECK(result_filter);
+ W_ERROR_HAVE_NO_MEMORY(result_filter);
break;
}
@@ -644,7 +644,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
}
info1->dns_domain_name = samdb_result_string(domain_res[0], "dnsRoot", NULL);
- WERR_TALLOC_CHECK(info1->dns_domain_name);
+ W_ERROR_HAVE_NO_MEMORY(info1->dns_domain_name);
info1->status = DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY;
if (result_filter) {
@@ -691,7 +691,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
switch (format_desired) {
case DRSUAPI_DS_NAME_FORMAT_FQDN_1779: {
info1->result_name = ldb_dn_linearize(mem_ctx, result_res[0]->dn);
- WERR_TALLOC_CHECK(info1->result_name);
+ W_ERROR_HAVE_NO_MEMORY(info1->result_name);
info1->status = DRSUAPI_DS_NAME_STATUS_OK;
return WERR_OK;
@@ -725,7 +725,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
return WERR_OK;
}
_dom = samdb_result_string(domain_res[0], "nETBIOSName", NULL);
- WERR_TALLOC_CHECK(_dom);
+ W_ERROR_HAVE_NO_MEMORY(_dom);
} else if (sid->num_auths == 5) {
const char *attrs[] = { NULL };
@@ -749,14 +749,14 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
}
_dom = samdb_result_string(domain_res2[0], "nETBIOSName", NULL);
- WERR_TALLOC_CHECK(_dom);
+ W_ERROR_HAVE_NO_MEMORY(_dom);
_acc = samdb_result_string(result_res[0], "sAMAccountName", NULL);
- WERR_TALLOC_CHECK(_acc);
+ W_ERROR_HAVE_NO_MEMORY(_acc);
}
info1->result_name = talloc_asprintf(mem_ctx, "%s\\%s", _dom, _acc);
- WERR_TALLOC_CHECK(info1->result_name);
+ W_ERROR_HAVE_NO_MEMORY(info1->result_name);
info1->status = DRSUAPI_DS_NAME_STATUS_OK;
return WERR_OK;
@@ -767,7 +767,7 @@ static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_
guid = samdb_result_guid(result_res[0], "objectGUID");
info1->result_name = GUID_string2(mem_ctx, &guid);
- WERR_TALLOC_CHECK(info1->result_name);
+ W_ERROR_HAVE_NO_MEMORY(info1->result_name);
info1->status = DRSUAPI_DS_NAME_STATUS_OK;
return WERR_OK;