(merge from 3.0)

Match Win2k, and return NT_STATUS_INVALID_PARAMETER
if this parameter is not an account type

Andrew Bartlett
(This used to be commit 43ee2e0b6a6f95ce2864befeb08b5de2ace41c7c)

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index be5f197198e518b6496a03a04bc72eafc1fe8874..bd26ce6849f400dfa093ad9baafc2f843c1558bc 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2135,9 +2135,9 @@ NTSTATUS _samr_create_user(pipes_struct *p, SAMR_Q_CREATE_USER *q_u, SAMR_R_CREA
                return nt_status;
        }
 
-       if (!acb_info) { 
+       if (!(acb_info == ACB_NORMAL || acb_info == ACB_DOMTRUST || acb_info == ACB_WSTRUST || acb_info == ACB_SVRTRUST)) { 
                /* Match Win2k, and return NT_STATUS_INVALID_PARAMETER if 
-                  this parameter is zero (ie, no user type specified) */
+                  this parameter is not an account type */
                return NT_STATUS_INVALID_PARAMETER;
        }