diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-07-06 05:51:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:48 -0500 |
| commit | 3ed1e8ff3c351296adfa78a99c19cc7b0fd5d7e7 (patch) | |
| tree | 6da0df4219f39e6d4dc0df57db101d2add66ffbc /source4/dsdb/samdb | |
| parent | 5e3ca4a73376db847cd3ca55807f5b1fcdbc9148 (diff) | |
| download | samba-3ed1e8ff3c351296adfa78a99c19cc7b0fd5d7e7.tar.gz samba-3ed1e8ff3c351296adfa78a99c19cc7b0fd5d7e7.tar.bz2 samba-3ed1e8ff3c351296adfa78a99c19cc7b0fd5d7e7.zip | |
r16829: Fix a number of issues raised by the IBM checker, or gcc warnings.
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 3e58350ec2ab883795b1dd03ac46a3520cac67d0)
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 9d7c78487a..abb267d884 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -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")); |