r2537: Add static and use strlen_m instead of str_charnum().

Andrew Bartlett
(This used to be commit f3bf57ca6be3b71ebd8f8312c3d9e54387bdc402)

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index 5a6efc137b7119cb6f71474b81df1e1e563f9247..282d83a1904013eb6fdde76aea623554565b4f96 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -405,7 +405,7 @@ NTSTATUS samr_ChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 /*
   check that a password is sufficiently complex
 */
-BOOL samdb_password_complexity_ok(const char *pass)
+static BOOL samdb_password_complexity_ok(const char *pass)
 {
        return check_password_quality(pass);
 }
@@ -482,7 +482,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
 
        if (new_pass) {
                /* check the various password restrictions */
-               if (minPwdLength > str_charnum(new_pass)) {
+               if (minPwdLength > strlen_m(new_pass)) {
                        if (reject_reason) {
                                *reject_reason = SAMR_REJECT_TOO_SHORT;
                        }