diff options
Diffstat (limited to 'source3/auth')
| -rw-r--r-- | source3/auth/auth_util.c | 4 | ||||
| -rw-r--r-- | source3/auth/server_info.c | 20 | ||||
| -rw-r--r-- | source3/auth/user_krb5.c | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 2c26414b27..fcfed834e5 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -797,7 +797,7 @@ static NTSTATUS get_guest_info3(TALLOC_CTX *mem_ctx, if (tmp == NULL) { return NT_STATUS_NO_MEMORY; } - init_lsa_StringLarge(&info3->base.domain, tmp); + init_lsa_StringLarge(&info3->base.logon_domain, tmp); /* Domain sid */ sid_copy(&domain_sid, get_global_sam_sid()); @@ -1372,7 +1372,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx, nt_username = sent_nt_username; } - nt_domain = talloc_strdup(mem_ctx, info3->base.domain.string); + nt_domain = talloc_strdup(mem_ctx, info3->base.logon_domain.string); if (!nt_domain) { /* If the server didn't give us one, just use the one we sent * them */ diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 5b2706a28a..6c2723d699 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -384,9 +384,9 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx, } } - unix_to_nt_time(&info3->base.last_logon, pdb_get_logon_time(samu)); - unix_to_nt_time(&info3->base.last_logoff, get_time_t_max()); - unix_to_nt_time(&info3->base.acct_expiry, get_time_t_max()); + unix_to_nt_time(&info3->base.logon_time, pdb_get_logon_time(samu)); + unix_to_nt_time(&info3->base.logoff_time, get_time_t_max()); + unix_to_nt_time(&info3->base.kickoff_time, get_time_t_max()); unix_to_nt_time(&info3->base.last_password_change, pdb_get_pass_last_set_time(samu)); unix_to_nt_time(&info3->base.allow_password_change, @@ -428,9 +428,9 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx, info3->base.logon_count = pdb_get_logon_count(samu); info3->base.bad_password_count = pdb_get_bad_password_count(samu); - info3->base.domain.string = talloc_strdup(info3, + info3->base.logon_domain.string = talloc_strdup(info3, pdb_get_domain(samu)); - RET_NOMEM(info3->base.domain.string); + RET_NOMEM(info3->base.logon_domain.string); info3->base.domain_sid = dom_sid_dup(info3, &domain_sid); RET_NOMEM(info3->base.domain_sid); @@ -560,9 +560,9 @@ struct netr_SamInfo3 *wbcAuthUserInfo_to_netr_SamInfo3(TALLOC_CTX *mem_ctx, info3 = talloc_zero(mem_ctx, struct netr_SamInfo3); if (!info3) return NULL; - info3->base.last_logon = info->logon_time; - info3->base.last_logoff = info->logoff_time; - info3->base.acct_expiry = info->kickoff_time; + info3->base.logon_time = info->logon_time; + info3->base.logoff_time = info->logoff_time; + info3->base.kickoff_time = info->kickoff_time; unix_to_nt_time(&info3->base.last_password_change, info->pass_last_set_time); unix_to_nt_time(&info3->base.allow_password_change, info->pass_can_change_time); @@ -635,9 +635,9 @@ struct netr_SamInfo3 *wbcAuthUserInfo_to_netr_SamInfo3(TALLOC_CTX *mem_ctx, RET_NOMEM(info3->base.logon_server.string); } if (info->domain_name) { - info3->base.domain.string = + info3->base.logon_domain.string = talloc_strdup(info3, info->domain_name); - RET_NOMEM(info3->base.domain.string); + RET_NOMEM(info3->base.logon_domain.string); } info3->base.domain_sid = dom_sid_dup(info3, &domain_sid); diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c index b106e45973..f90ef6c158 100644 --- a/source3/auth/user_krb5.c +++ b/source3/auth/user_krb5.c @@ -73,9 +73,9 @@ NTSTATUS get_user_from_kerberos_info(TALLOC_CTX *mem_ctx, } } - if (logon_info && logon_info->info3.base.domain.string) { + if (logon_info && logon_info->info3.base.logon_domain.string) { domain = talloc_strdup(mem_ctx, - logon_info->info3.base.domain.string); + logon_info->info3.base.logon_domain.string); if (!domain) { return NT_STATUS_NO_MEMORY; } @@ -259,7 +259,7 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx, * %D. */ if (server_info->info3 != NULL) { - server_info->info3->base.domain.string = + server_info->info3->base.logon_domain.string = talloc_strdup(server_info->info3, ntdomain); } } |