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 | |
| 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')
| -rw-r--r-- | source3/rpc_server/srv_eventlog.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srv_ntsvcs.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_svcctl.c | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_eventlog.c b/source3/rpc_server/srv_eventlog.c index da761c905e..973be28040 100644 --- a/source3/rpc_server/srv_eventlog.c +++ b/source3/rpc_server/srv_eventlog.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/srv_eventlog.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV diff --git a/source3/rpc_server/srv_ntsvcs.c b/source3/rpc_server/srv_ntsvcs.c index 100d577010..5010990b58 100644 --- a/source3/rpc_server/srv_ntsvcs.c +++ b/source3/rpc_server/srv_ntsvcs.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/srv_ntsvcs.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV 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, diff --git a/source3/rpc_server/srv_svcctl.c b/source3/rpc_server/srv_svcctl.c index 84864364f7..4b3fdda3cb 100644 --- a/source3/rpc_server/srv_svcctl.c +++ b/source3/rpc_server/srv_svcctl.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "librpc/gen_ndr/srv_svcctl.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV |