diff options
| -rw-r--r-- | source3/passdb/smbpass.c | 7 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c index 45935db99e..351dfd438b 100644 --- a/source3/passdb/smbpass.c +++ b/source3/passdb/smbpass.c @@ -329,13 +329,6 @@ static struct smb_passwd *getsmbfilepwent(void *vp) pw_buf.smb_nt_passwd = NULL; pw_buf.smb_passwd = NULL; pw_buf.acct_ctrl |= ACB_DISABLED; - -#if 0 /* JFM */ - /* commented to continue in the case of a trust account disabled */ - /* samr_create_user() is adding disabled accounts */ - - return &pw_buf; -#endif } if (linebuf_len < (PTR_DIFF(p, linebuf) + 33)) { diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index 2ef29df990..e3425f3247 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -1850,7 +1850,10 @@ static BOOL api_samr_create_user(pipes_struct *p) DEBUG(5,("api_samr_create_user: %d\n", __LINE__)); /* grab the samr create user */ - samr_io_q_create_user("", &q_u, data, 0); + if (!samr_io_q_create_user("", &q_u, data, 0)) { + DEBUG(0,("api_samr_create_user: Unable to unmarshall SAMR_Q_CREATE_USER.\n")); + return False; + } /* find the policy handle. open a policy on it. */ if ((find_lsa_policy_by_hnd(&q_u.pol) == -1)) { @@ -1885,6 +1888,13 @@ static BOOL api_samr_create_user(pipes_struct *p) local_flags=LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_SET_NO_PASSWORD; local_flags|= (q_u.acb_info & ACB_WSTRUST) ? LOCAL_TRUST_ACCOUNT:0; + /* + * NB. VERY IMPORTANT ! This call must be done as the current pipe user, + * *NOT* surrounded by a become_root()/unbecome_root() call. This ensures + * that only people with write access to the smbpasswd file will be able + * to create a user. JRA. + */ + if (!local_password_change(mach_acct, local_flags, NULL, err_str, sizeof(err_str), msg_str, sizeof(msg_str))) { DEBUG(0, ("%s\n", err_str)); r_u.status = NT_STATUS_ACCESS_DENIED; |