summaryrefslogtreecommitdiff
path: root/source4/rpc_server/samr
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-02-17 23:11:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:10:45 -0500
commitc52fb55903fc68dd6e9d13f618277b2c12e17aa6 (patch)
treed71b34db517d01b847a30454536270b3c3d79999 /source4/rpc_server/samr
parenta2aa220709eca6dd260d9eeecf918f9bb129d8ed (diff)
downloadsamba-c52fb55903fc68dd6e9d13f618277b2c12e17aa6.tar.gz
samba-c52fb55903fc68dd6e9d13f618277b2c12e17aa6.tar.bz2
samba-c52fb55903fc68dd6e9d13f618277b2c12e17aa6.zip
r5437: Allow Samba4 to be compiled by tcc (www.tinycc.org). It still crashes when linking though.
(This used to be commit 2e1e8db6dc877eb32b51cfc3d9c8f463d14530ec)
Diffstat (limited to 'source4/rpc_server/samr')
-rw-r--r--source4/rpc_server/samr/samr_password.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index a1c61f03ec..468f02d831 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -488,7 +488,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
struct samr_Password *lmNewHash,
struct samr_Password *ntNewHash,
BOOL user_change,
- BOOL restrict,
+ BOOL restrictions,
uint32_t *reject_reason)
{
const char * const user_attrs[] = { "userAccountControl", "lmPwdHistory",
@@ -544,7 +544,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
if (new_pass) {
/* check the various password restrictions */
- if (restrict && minPwdLength > strlen_m(new_pass)) {
+ if (restrictions && minPwdLength > strlen_m(new_pass)) {
if (reject_reason) {
*reject_reason = SAMR_REJECT_TOO_SHORT;
}
@@ -552,7 +552,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
}
/* possibly check password complexity */
- if (restrict && pwdProperties & DOMAIN_PASSWORD_COMPLEX &&
+ if (restrictions && pwdProperties & DOMAIN_PASSWORD_COMPLEX &&
!samdb_password_complexity_ok(new_pass)) {
if (reject_reason) {
*reject_reason = SAMR_REJECT_COMPLEXITY;
@@ -568,7 +568,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
ntNewHash = &local_ntNewHash;
}
- if (restrict && user_change) {
+ if (restrictions && user_change) {
/* are all password changes disallowed? */
if (pwdProperties & DOMAIN_REFUSE_PASSWORD_CHANGE) {
if (reject_reason) {