sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-12 12:23:50 +03:00
Code Activity

s3-libads: pass down local_service to kerberos_return_pac().

Browse Source 
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Günther Deschner
2014-01-17 14:29:03 +01:00
parent 41d8d99d8a
commit 932490ae08
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source3/libads/authdata.c
View File

@@ -101,13 +101,13 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
bool add_netbios_addr, bool add_netbios_addr,
time_t renewable_time, time_t renewable_time,
const char *impersonate_princ_s, const char *impersonate_princ_s,
const char *local_service,
struct PAC_LOGON_INFO **_logon_info) struct PAC_LOGON_INFO **_logon_info)
{ {
krb5_error_code ret; krb5_error_code ret;
NTSTATUS status = NT_STATUS_INVALID_PARAMETER; NTSTATUS status = NT_STATUS_INVALID_PARAMETER;
DATA_BLOB tkt, tkt_wrapped, ap_rep, sesskey1; DATA_BLOB tkt, tkt_wrapped, ap_rep, sesskey1;
const char *auth_princ = NULL; const char *auth_princ = NULL;
const char *local_service = NULL;
const char *cc = "MEMORY:kerberos_return_pac"; const char *cc = "MEMORY:kerberos_return_pac";
struct auth_session_info *session_info; struct auth_session_info *session_info;
struct gensec_security *gensec_server_context; struct gensec_security *gensec_server_context;
@@ -141,10 +141,6 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
} }
NT_STATUS_HAVE_NO_MEMORY(auth_princ); NT_STATUS_HAVE_NO_MEMORY(auth_princ);
local_service = talloc_asprintf(mem_ctx, "%s$@%s",
lp_netbios_name(), lp_realm());
NT_STATUS_HAVE_NO_MEMORY(local_service);
ret = kerberos_kinit_password_ext(auth_princ, ret = kerberos_kinit_password_ext(auth_princ,
pass, pass,
time_offset, time_offset,

1
source3/libads/kerberos_proto.h
View File

@@ -77,6 +77,7 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
bool add_netbios_addr, bool add_netbios_addr,
time_t renewable_time, time_t renewable_time,
const char *impersonate_princ_s, const char *impersonate_princ_s,
const char *local_service,
struct PAC_LOGON_INFO **logon_info); struct PAC_LOGON_INFO **logon_info);
/* The following definitions come from libads/krb5_setpw.c */ /* The following definitions come from libads/krb5_setpw.c */

8
source3/utils/net_ads.c
View File

@@ -2604,6 +2604,7 @@ static int net_ads_kerberos_pac(struct net_context *c, int argc, const char **ar
NTSTATUS status; NTSTATUS status;
int ret = -1; int ret = -1;
const char *impersonate_princ_s = NULL; const char *impersonate_princ_s = NULL;
const char *local_service = NULL;
if (c->display_usage) { if (c->display_usage) {
d_printf( "%s\n" d_printf( "%s\n"
@@ -2623,6 +2624,12 @@ static int net_ads_kerberos_pac(struct net_context *c, int argc, const char **ar
impersonate_princ_s = argv[0]; impersonate_princ_s = argv[0];
} }
local_service = talloc_asprintf(mem_ctx, "%s$@%s",
lp_netbios_name(), lp_realm());
if (local_service == NULL) {
goto out;
}
c->opt_password = net_prompt_pass(c, c->opt_user_name); c->opt_password = net_prompt_pass(c, c->opt_user_name);
status = kerberos_return_pac(mem_ctx, status = kerberos_return_pac(mem_ctx,
@@ -2636,6 +2643,7 @@ static int net_ads_kerberos_pac(struct net_context *c, int argc, const char **ar
true, true,
2592000, /* one month */ 2592000, /* one month */
impersonate_princ_s, impersonate_princ_s,
local_service,
&info); &info);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
d_printf(_("failed to query kerberos PAC: %s\n"), d_printf(_("failed to query kerberos PAC: %s\n"),

9
source3/winbindd/winbindd_pam.c
View File

@@ -576,6 +576,7 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx,
time_t time_offset = 0; time_t time_offset = 0;
const char *user_ccache_file; const char *user_ccache_file;
struct PAC_LOGON_INFO *logon_info = NULL; struct PAC_LOGON_INFO *logon_info = NULL;
const char *local_service;
*info3 = NULL; *info3 = NULL;
@@ -632,6 +633,13 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
local_service = talloc_asprintf(mem_ctx, "%s$@%s",
lp_netbios_name(), lp_realm());
if (local_service == NULL) {
return NT_STATUS_NO_MEMORY;
}
/* if this is a user ccache, we need to act as the user to let the krb5 /* if this is a user ccache, we need to act as the user to let the krb5
* library handle the chown, etc. */ * library handle the chown, etc. */
@@ -653,6 +661,7 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx,
true, true,
WINBINDD_PAM_AUTH_KRB5_RENEW_TIME, WINBINDD_PAM_AUTH_KRB5_RENEW_TIME,
NULL, NULL,
local_service,
&logon_info); &logon_info);
if (user_ccache_file != NULL) { if (user_ccache_file != NULL) {
gain_root_privilege(); gain_root_privilege();