From 8870daeb8d93e45320eb5bcfa58544d520dc7c69 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 21 Oct 2011 16:10:43 -0400 Subject: idl: Improve MS-PAC IDL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change some misleading variable names to reflect the actual function. Add missing field name/types previously marked as unkown. Signed-off-by: Günther Deschner Autobuild-User: Günther Deschner Autobuild-Date: Mon Oct 24 19:19:28 CEST 2011 on sn-devel-104 --- source3/auth/auth_util.c | 4 ++-- source3/auth/server_info.c | 20 ++++++++++---------- source3/auth/user_krb5.c | 6 +++--- source3/rpc_client/util_netlogon.c | 2 +- source3/rpc_server/rpc_server.c | 2 +- source3/winbindd/winbindd_pam.c | 14 +++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source3') 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); } } diff --git a/source3/rpc_client/util_netlogon.c b/source3/rpc_client/util_netlogon.c index 558a4dae03..d22078be33 100644 --- a/source3/rpc_client/util_netlogon.c +++ b/source3/rpc_client/util_netlogon.c @@ -52,7 +52,7 @@ NTSTATUS copy_netr_SamBaseInfo(TALLOC_CTX *mem_ctx, } COPY_LSA_STRING(mem_ctx, in, out, logon_server); - COPY_LSA_STRING(mem_ctx, in, out, domain); + COPY_LSA_STRING(mem_ctx, in, out, logon_domain); if (in->domain_sid) { out->domain_sid = dom_sid_dup(mem_ctx, in->domain_sid); diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index 5270b72fbd..89885b9230 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -111,7 +111,7 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, status = make_server_info_info3(p, info3->base.account_name.string, - info3->base.domain.string, + info3->base.logon_domain.string, &server_info, info3); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to init server info\n")); diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 7417bf42cb..999cb156ed 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -52,11 +52,11 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx, uint32_t i; resp->data.auth.info3.logon_time = - nt_time_to_unix(info3->base.last_logon); + nt_time_to_unix(info3->base.logon_time); resp->data.auth.info3.logoff_time = - nt_time_to_unix(info3->base.last_logoff); + nt_time_to_unix(info3->base.logoff_time); resp->data.auth.info3.kickoff_time = - nt_time_to_unix(info3->base.acct_expiry); + nt_time_to_unix(info3->base.kickoff_time); resp->data.auth.info3.pass_last_set_time = nt_time_to_unix(info3->base.last_password_change); resp->data.auth.info3.pass_can_change_time = @@ -93,7 +93,7 @@ static NTSTATUS append_info3_as_txt(TALLOC_CTX *mem_ctx, fstrcpy(resp->data.auth.info3.logon_srv, info3->base.logon_server.string); fstrcpy(resp->data.auth.info3.logon_dom, - info3->base.domain.string); + info3->base.logon_domain.string); ex = talloc_strdup(mem_ctx, ""); NT_STATUS_HAVE_NO_MEMORY(ex); @@ -156,7 +156,7 @@ static NTSTATUS append_unix_username(TALLOC_CTX *mem_ctx, const char *nt_username, *nt_domain; - 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 */ @@ -895,7 +895,7 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain, return NT_STATUS_LOGON_FAILURE; } - kickoff_time = nt_time_to_unix(my_info3->base.acct_expiry); + kickoff_time = nt_time_to_unix(my_info3->base.kickoff_time); if (kickoff_time != 0 && time(NULL) > kickoff_time) { return NT_STATUS_ACCOUNT_EXPIRED; } @@ -977,7 +977,7 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain, /* FIXME: we possibly should handle logon hours as well (does xp when * offline?) see auth/auth_sam.c:sam_account_ok for details */ - unix_to_nt_time(&my_info3->base.last_logon, time(NULL)); + unix_to_nt_time(&my_info3->base.logon_time, time(NULL)); my_info3->base.bad_password_count = 0; result = winbindd_update_creds_by_info3(domain, -- cgit