summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-06-19 10:23:02 -0700
committerJeremy Allison <jra@samba.org>2012-06-19 10:27:24 -0700
commit028a7d9b288bb2662bb45ccaff9cf9e7bc76a487 (patch)
treeb9fd6f5755213ba29597e48f960eb42047ab585e
parent53cc8f8011cf1644d1ed96546736ebbb15570b68 (diff)
downloadsamba-028a7d9b288bb2662bb45ccaff9cf9e7bc76a487.tar.gz
samba-028a7d9b288bb2662bb45ccaff9cf9e7bc76a487.tar.bz2
samba-028a7d9b288bb2662bb45ccaff9cf9e7bc76a487.zip
Fix unused variable warnings.
-rw-r--r--source3/winbindd/idmap_adex/provider_unified.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/source3/winbindd/idmap_adex/provider_unified.c b/source3/winbindd/idmap_adex/provider_unified.c
index 9e271a0db9..438fb7c978 100644
--- a/source3/winbindd/idmap_adex/provider_unified.c
+++ b/source3/winbindd/idmap_adex/provider_unified.c
@@ -98,8 +98,12 @@ static char* build_id_filter(TALLOC_CTX *mem_ctx,
return NULL;
}
- BAIL_ON_PTR_ERROR(oc_filter, nt_status);
- BAIL_ON_PTR_ERROR(attr_filter, nt_status);
+ if (oc_filter == NULL) {
+ goto done;
+ }
+ if (attr_filter == NULL) {
+ goto done;
+ }
/* Use "keywords=%s" for non-schema cells */
@@ -130,7 +134,6 @@ static char* build_alias_filter(TALLOC_CTX *mem_ctx,
{
char *filter = NULL;
char *user_attr_filter, *group_attr_filter;
- NTSTATUS nt_status;
TALLOC_CTX *frame = talloc_stackframe();
bool use2307 = ((search_flags & LWCELL_FLAG_USE_RFC2307_ATTRS)
== LWCELL_FLAG_USE_RFC2307_ATTRS);
@@ -143,8 +146,12 @@ static char* build_alias_filter(TALLOC_CTX *mem_ctx,
ADEX_ATTR_UID, alias);
group_attr_filter = talloc_asprintf(frame, "%s=%s",
ADEX_ATTR_DISPLAYNAME, alias);
- BAIL_ON_PTR_ERROR(user_attr_filter, nt_status);
- BAIL_ON_PTR_ERROR(group_attr_filter, nt_status);
+ if (user_attr_filter == NULL) {
+ goto done;
+ }
+ if (group_attr_filter == NULL) {
+ goto done;
+ }
/* Use "keywords=%s" for non-schema cells */