diff options
| author | Günther Deschner <gd@samba.org> | 2008-02-12 00:07:41 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-02-12 09:48:47 +0100 |
| commit | 90631dd2c27db6480ddfaec5746c84579ec684be (patch) | |
| tree | da4b4a2d3efd974570a6fcd7ccbc96ed6029911b /source3/utils | |
| parent | f0149d23d206675304d879d60c491da3497ef3b9 (diff) | |
| download | samba-90631dd2c27db6480ddfaec5746c84579ec684be.tar.gz samba-90631dd2c27db6480ddfaec5746c84579ec684be.tar.bz2 samba-90631dd2c27db6480ddfaec5746c84579ec684be.zip | |
Removing unused ACCT_-flags.
Guenther
(This used to be commit d1e5a5a7f9dfb5756398e99cf09a4712d2b42682)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_domain.c | 3 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c index 8bd23782d4..c545fd9160 100644 --- a/source3/utils/net_domain.c +++ b/source3/utils/net_domain.c @@ -371,7 +371,8 @@ NTSTATUS netdom_join_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli, ZERO_STRUCT(ctr); ZERO_STRUCT(p25); - fields_present = ACCT_NT_PWD_SET | ACCT_LM_PWD_SET | ACCT_FLAGS; + fields_present = ACCT_NT_PWD_SET | ACCT_LM_PWD_SET | + SAMR_FIELD_ACCT_FLAGS; init_sam_user_info25P(&p25, fields_present, acb_info, (char *)pwbuf); ctr.switch_value = infolevel; diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 71ed74edcc..46b66bbd36 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1547,7 +1547,7 @@ do { if (strequal(ctx->thiscmd, name)) { \ do { if (strequal(ctx->thiscmd, name)) { \ init_unistr2(&usr->uni_##rec, argv[0], UNI_STR_TERMINATE); \ init_uni_hdr(&usr->hdr_##rec, &usr->uni_##rec); \ - usr->fields_present |= ACCT_##flag; } \ + usr->fields_present |= SAMR_FIELD_##flag; } \ } while (0); static NTSTATUS rpc_sh_user_str_edit_internals(TALLOC_CTX *mem_ctx, @@ -1597,10 +1597,10 @@ static NTSTATUS rpc_sh_user_str_edit_internals(TALLOC_CTX *mem_ctx, } SETSTR("fullname", full_name, FULL_NAME); - SETSTR("homedir", home_dir, HOME_DIR); + SETSTR("homedir", home_dir, HOME_DIRECTORY); SETSTR("homedrive", dir_drive, HOME_DRIVE); SETSTR("logonscript", logon_script, LOGON_SCRIPT); - SETSTR("profilepath", profile_path, PROFILE); + SETSTR("profilepath", profile_path, PROFILE_PATH); SETSTR("description", acct_desc, DESCRIPTION); result = rpccli_samr_set_userinfo2( @@ -1682,7 +1682,7 @@ static NTSTATUS rpc_sh_user_flag_edit_internals(TALLOC_CTX *mem_ctx, ZERO_STRUCTP(usr); usr->acb_info = newflags; - usr->fields_present = ACCT_FLAGS; + usr->fields_present = SAMR_FIELD_ACCT_FLAGS; result = rpccli_samr_set_userinfo2( pipe_hnd, mem_ctx, user_hnd, 21, @@ -5680,7 +5680,7 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, ¬ime, ¬ime, ¬ime, nostr, nostr, nostr, nostr, nostr, nostr, nostr, nostr, nostr, nostr, - 0, 0, acb_info, ACCT_FLAGS, 168, &hrs, + 0, 0, acb_info, SAMR_FIELD_ACCT_FLAGS, 168, &hrs, 0, 0, (char *)pwbuf); ctr.switch_value = 23; ctr.info.id23 = &p23; |