sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s4:dsdb Provide an intelegent fallback if not CN=Subnets is found

Browse Source 
We may as well fall back rather than return NULL (which callers don't
do useful things with).

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2010-05-07 22:43:36 +10:00
parent 23cafd5569
commit 6dfa851ce9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source4/dsdb/common/util.c
View File

@ -1607,7 +1607,7 @@ const char *samdb_client_site_name(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
const struct ldb_val *val;
const char *site_name = NULL, *l_subnet_name = NULL;
const char *allow_list[2] = { NULL, NULL };
unsigned int i;
unsigned int i, count;
int cnt, ret;
/*
@ -1632,13 +1632,17 @@ const char *samdb_client_site_name(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
ret = ldb_search(ldb, mem_ctx, &res, subnets_dn, LDB_SCOPE_ONELEVEL,
attrs, NULL);
if (ret != LDB_SUCCESS) {
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
count = 0;
} else if (ret != LDB_SUCCESS) {
talloc_free(sites_container_dn);
talloc_free(subnets_dn);
return NULL;
} else {
count = res->count;
}
for (i = 0; i < res->count; i++) {
for (i = 0; i < count; i++) {
l_subnet_name = ldb_msg_find_attr_as_string(res->msgs[i], "cn",
NULL);