diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-02-04 09:19:54 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-02-04 17:14:22 +0100 |
| commit | e5ca813ffb4398faeefc96c224d3b2677e576c7a (patch) | |
| tree | 7329f4d1aede25faccd717d9273859aba3ddc8e5 | |
| parent | 54cc3b1f42eba19170e611b0ee0ea464ea4ac604 (diff) | |
| download | samba-e5ca813ffb4398faeefc96c224d3b2677e576c7a.tar.gz samba-e5ca813ffb4398faeefc96c224d3b2677e576c7a.tar.bz2 samba-e5ca813ffb4398faeefc96c224d3b2677e576c7a.zip | |
dsdb/util: rework samdb_check_password() to support utf8
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source4/dsdb/common/util.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 2b96bd431e..8e407768ff 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -1906,19 +1906,30 @@ int samdb_search_for_parent_domain(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, * * Result codes from "enum samr_ValidationStatus" (consider "samr.idl") */ -enum samr_ValidationStatus samdb_check_password(const DATA_BLOB *password, +enum samr_ValidationStatus samdb_check_password(const DATA_BLOB *utf8_blob, const uint32_t pwdProperties, const uint32_t minPwdLength) { + const char *utf8_pw = (const char *)utf8_blob->data; + size_t utf8_len = strlen_m(utf8_pw); + /* checks if the "minPwdLength" property is satisfied */ - if (minPwdLength > password->length) + if (minPwdLength > utf8_len) { return SAMR_VALIDATION_STATUS_PWD_TOO_SHORT; + } /* checks the password complexity */ - if (((pwdProperties & DOMAIN_PASSWORD_COMPLEX) != 0) - && (password->data != NULL) - && (!check_password_quality((const char *) password->data))) + if (!(pwdProperties & DOMAIN_PASSWORD_COMPLEX)) { + return SAMR_VALIDATION_STATUS_SUCCESS; + } + + if (utf8_len == 0) { return SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH; + } + + if (!check_password_quality(utf8_pw)) { + return SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH; + } return SAMR_VALIDATION_STATUS_SUCCESS; } |