diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-12-07 11:06:40 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-12-07 11:06:40 +0000 |
commit | 570c0c12fd5c7414d9543e48bc0f9139f8371d67 (patch) | |
tree | f54d21bd14565c8cd09881b37bb7bc230ec89deb /source3/rpc_server/srv_samr_nt.c | |
parent | 05646504c7046e61971948512d3ba6ca5eee69aa (diff) | |
download | samba-570c0c12fd5c7414d9543e48bc0f9139f8371d67.tar.gz samba-570c0c12fd5c7414d9543e48bc0f9139f8371d67.tar.bz2 samba-570c0c12fd5c7414d9543e48bc0f9139f8371d67.zip |
Merge from 3.0:
source/libsmb/ntlmssp.c:
Picked up by the build farm - despite all my efforts, security=server was
broken by my NTLM2 commit. This should correctly cause the NTLM2 case
not to be negotiated when 'security=server' is in effect.
testsuide/build_farm/runlist:
Without 'non unix accounts' we can't test security=domain on the build farm.
source/rpc_server/srv_samr_nt.c:
Match Win2k and return 'invalid parameter' for creating of a new account with
account flags of 0.
Andrew Bartlett
(This used to be commit e97f1eb62ae01b5259d7ecfab9b55b07103379c7)
Diffstat (limited to 'source3/rpc_server/srv_samr_nt.c')
-rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 7be9b41ee9..7f57a9fc9d 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2130,6 +2130,12 @@ NTSTATUS _samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_CREA return nt_status; } + if (!acb_info) { + /* Match Win2k, and return NT_STATUS_INVALID_PARAMETER if + this parameter is zero (ie, no user type specified) */ + return NT_STATUS_INVALID_PARAMETER; + } + /* find the account: tell the caller if it exists. lkclXXXX i have *no* idea if this is a problem or not or even if you are supposed to construct a different |