diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-01 14:36:06 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-01 14:36:24 +0000 |
| commit | 8770c8fe2fa1dbb5ecb1c2575187aed319356670 (patch) | |
| tree | 76e09db908b23fa7b81702fe0c621eddc9c9593a /source4/dsdb/samdb/ldb_modules/samldb.c | |
| parent | 2f9480407dced4e39aeae5681acfa5454fd8fda4 (diff) | |
| download | samba-8770c8fe2fa1dbb5ecb1c2575187aed319356670.tar.gz samba-8770c8fe2fa1dbb5ecb1c2575187aed319356670.tar.bz2 samba-8770c8fe2fa1dbb5ecb1c2575187aed319356670.zip | |
s4:samldb LDB module - the "sAMAccountName" cannot be substituted by nothing
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Mon Nov 1 14:36:24 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/samldb.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 0a7ab22c40..13b173a6bc 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -177,7 +177,10 @@ static int samldb_check_sAMAccountName(struct samldb_ctx *ac) name = ldb_msg_find_attr_as_string(ac->msg, "sAMAccountName", NULL); if (name == NULL) { - return ldb_operr(ldb); + /* The "sAMAccountName" cannot be nothing */ + ldb_set_errstring(ldb, + "samldb: Empty account names aren't allowed!"); + return LDB_ERR_CONSTRAINT_VIOLATION; } ret = samdb_search_count(ldb, ac, NULL, "(sAMAccountName=%s)", @@ -1389,7 +1392,10 @@ static int samldb_sam_accountname_check(struct samldb_ctx *ac) talloc_free(tmp_msg); if (sam_accountname == NULL) { - return ldb_operr(ldb); + /* The "sAMAccountName" cannot be nothing */ + ldb_set_errstring(ldb, + "samldb: Empty account names aren't allowed!"); + return LDB_ERR_UNWILLING_TO_PERFORM; } enc_str = ldb_binary_encode_string(ac, sam_accountname); |