sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r16829: Fix a number of issues raised by the IBM checker, or gcc warnings.

Browse Source 
In particular, this removes one use of the LDB_DN_NULL_FAILED macro,
which was being used on more than DNs, had an embedded goto, and
confused the IBM checker.

In the password_hash code, ensure that sambaAttr is not, before
checking the number of values.

In GENSEC, note that this switch value can't occour.  This seems to be
the only way to quiet both the IBM checker and gcc, as well as cope
with possibly invalid inputs.

Andrew Bartlet
(This used to be commit 3e58350ec2)
This commit is contained in:
Andrew Bartlett 2006-07-06 05:51:39 +00:00 committed by Gerald (Jerry) Carter
parent 5e3ca4a733
commit 3ed1e8ff3c
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/auth/gensec/gensec.c
View File

@ -87,8 +87,9 @@ struct gensec_security_ops **gensec_use_kerberos_mechs(TALLOC_CTX *mem_ctx,
j++;
}
break;
case CRED_AUTO_USE_KERBEROS:
break;
default:
/* Can't happen or invalid parameter */
return NULL;
}
}
new_gensec_list[j] = NULL;

2
source4/dsdb/samdb/ldb_modules/password_hash.c
View File

@ -597,7 +597,7 @@ static int password_hash_add(struct ldb_module *module, struct ldb_request *req)
/* check sambaPassword is single valued here */
/* TODO: remove this when sambaPassword will be single valued in schema */
if (sambaAttr->num_values > 1) {
if (sambaAttr && sambaAttr->num_values > 1) {
ldb_set_errstring(module->ldb,
talloc_asprintf(req,
"mupltiple values for sambaPassword not allowed!\n"));

19
source4/lib/ldb/common/ldb_dn.c
View File

@ -578,32 +578,35 @@ struct ldb_dn *ldb_dn_casefold(struct ldb_context *ldb, const struct ldb_dn *edn
if (edn == NULL) return NULL;
cedn = ldb_dn_new(ldb);
LDB_DN_NULL_FAILED(cedn);
return NULL;
cedn->comp_num = edn->comp_num;
cedn->components = talloc_array(cedn, struct ldb_dn_component, edn->comp_num);
LDB_DN_NULL_FAILED(cedn->components);
if (!cedn->components) {
talloc_free(cedn);
return NULL;
}
for (i = 0; i < edn->comp_num; i++) {
struct ldb_dn_component dc;
const struct ldb_attrib_handler *h;
dc.name = ldb_attr_casefold(cedn, edn->components[i].name);
LDB_DN_NULL_FAILED(dc.name);
if (!dc.name) {
talloc_free(cedn);
return NULL;
}
h = ldb_attrib_handler(ldb, dc.name);
if (h->canonicalise_fn(ldb, cedn, &(edn->components[i].value), &(dc.value)) != 0) {
goto failed;
talloc_free(cedn);
return NULL;
}
cedn->components[i] = dc;
}
return cedn;
failed:
talloc_free(cedn);
return NULL;
}
struct ldb_dn *ldb_dn_explode_casefold(struct ldb_context *ldb, const char *dn)