diff options
| author | Günther Deschner <gd@samba.org> | 2008-12-06 00:28:34 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-01-06 16:02:10 +0100 |
| commit | 46f55ef5bc73f9a9d563913433d7d71655123aaa (patch) | |
| tree | 7de7d92ea70ef2c50b0f0d4f9e6cd534a7ea2f0a /source3/utils | |
| parent | a97c9bab4423d73c8b97bd6589bd1a7ff226cfc7 (diff) | |
| download | samba-46f55ef5bc73f9a9d563913433d7d71655123aaa.tar.gz samba-46f55ef5bc73f9a9d563913433d7d71655123aaa.tar.bz2 samba-46f55ef5bc73f9a9d563913433d7d71655123aaa.zip | |
s3-samr: avoid all init_samr_user* functions.
Guenther
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 30 | ||||
| -rw-r--r-- | source3/utils/net_rpc_join.c | 4 |
2 files changed, 7 insertions, 27 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index e0d606c19a..652f0b531b 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -5225,38 +5225,18 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c, } { - NTTIME notime; - struct samr_LogonHours hours; - struct lsa_BinaryString parameters; - const int units_per_week = 168; struct samr_CryptPassword crypt_pwd; - ZERO_STRUCT(notime); - ZERO_STRUCT(hours); - ZERO_STRUCT(parameters); - - hours.bits = talloc_array(mem_ctx, uint8_t, units_per_week); - if (!hours.bits) { - result = NT_STATUS_NO_MEMORY; - goto done; - } - hours.units_per_week = units_per_week; - memset(hours.bits, 0xFF, units_per_week); + ZERO_STRUCT(info.info23); init_samr_CryptPassword(argv[1], &cli->user_session_key, &crypt_pwd); - init_samr_user_info23(&info.info23, - notime, notime, notime, - notime, notime, notime, - NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, ¶meters, - 0, 0, ACB_DOMTRUST, - SAMR_FIELD_ACCT_FLAGS | SAMR_FIELD_NT_PASSWORD_PRESENT, - hours, - 0, 0, 0, 0, 0, 0, 0, - &crypt_pwd); + info.info23.info.fields_present = SAMR_FIELD_ACCT_FLAGS | + SAMR_FIELD_NT_PASSWORD_PRESENT; + info.info23.info.acct_flags = ACB_DOMTRUST; + info.info23.password = crypt_pwd; result = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx, &user_pol, diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 8070a6282b..5651676693 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -339,8 +339,8 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) &cli->user_session_key, &crypt_pwd); - init_samr_user_info24(&set_info.info24, &crypt_pwd, - PASS_DONT_CHANGE_AT_NEXT_LOGON); + set_info.info24.password = crypt_pwd; + set_info.info24.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON; CHECK_RPC_ERR(rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx, &user_pol, |