diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-20 21:35:10 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-20 21:35:10 +0200 |
commit | d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1 (patch) | |
tree | cbf55ec9969235754fee3b1264d4e775476ead75 /source3/rpc_server/srv_samr_nt.c | |
parent | 2c1b1255c2dc095013863a1d99b750e8506237fa (diff) | |
parent | bc9bbda8b390a221d7b88fd6eb1b54efc8c91c6b (diff) | |
download | samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.tar.gz samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.tar.bz2 samba-d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1.zip |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
source3/include/proto.h
Diffstat (limited to 'source3/rpc_server/srv_samr_nt.c')
-rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 6cf90be6d9..e527631cc1 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2909,6 +2909,10 @@ static NTSTATUS samr_QueryDomainInfo_internal(const char *fn_name, unix_to_nt_time_abs(&nt_expire, u_expire); unix_to_nt_time_abs(&nt_min_age, u_min_age); + if (lp_check_password_script() && *lp_check_password_script()) { + password_properties |= DOMAIN_PASSWORD_COMPLEX; + } + init_samr_DomInfo1(&dom_info->info1, (uint16)min_pass_len, (uint16)pass_hist, |