diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-14 23:23:34 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-17 12:47:50 +0200 |
| commit | e3bdff3d67b46277ee59685218bd90f3788b487d (patch) | |
| tree | 7200fdaa04cda835116cd06d1f6265b4d1befefa | |
| parent | 14ac2bb36ee22be6133ca1d069dc5de6c1891f47 (diff) | |
| download | samba-e3bdff3d67b46277ee59685218bd90f3788b487d.tar.gz samba-e3bdff3d67b46277ee59685218bd90f3788b487d.tar.bz2 samba-e3bdff3d67b46277ee59685218bd90f3788b487d.zip | |
s3-kerberos: pass down kdc_name to create_local_private_krb5_conf_for_domain().
Guenther
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/libads/kerberos.c | 19 | ||||
| -rw-r--r-- | source3/libsmb/namequery_dc.c | 6 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 6 |
4 files changed, 22 insertions, 12 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 91b6bd9010..b633d9ef8a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1821,7 +1821,8 @@ int kerberos_kinit_password(const char *principal, bool create_local_private_krb5_conf_for_domain(const char *realm, const char *domain, const char *sitename, - struct sockaddr_storage *pss); + struct sockaddr_storage *pss, + const char *kdc_name); /* The following definitions come from libads/kerberos_keytab.c */ diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 7fb4ec33e4..01a88e8d34 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -715,7 +715,8 @@ int kerberos_kinit_password(const char *principal, static char *print_kdc_line(char *mem_ctx, const char *prev_line, - const struct sockaddr_storage *pss) + const struct sockaddr_storage *pss, + const char *kdc_name) { char *kdc_str = NULL; @@ -772,14 +773,15 @@ static char *print_kdc_line(char *mem_ctx, static char *get_kdc_ip_string(char *mem_ctx, const char *realm, const char *sitename, - struct sockaddr_storage *pss) + struct sockaddr_storage *pss, + const char *kdc_name) { int i; struct ip_service *ip_srv_site = NULL; struct ip_service *ip_srv_nonsite = NULL; int count_site = 0; int count_nonsite; - char *kdc_str = print_kdc_line(mem_ctx, "", pss); + char *kdc_str = print_kdc_line(mem_ctx, "", pss, kdc_name); if (kdc_str == NULL) { return NULL; @@ -803,7 +805,8 @@ static char *get_kdc_ip_string(char *mem_ctx, * but not done often. */ kdc_str = print_kdc_line(mem_ctx, kdc_str, - &ip_srv_site[i].ss); + &ip_srv_site[i].ss, + NULL); if (!kdc_str) { SAFE_FREE(ip_srv_site); return NULL; @@ -840,7 +843,8 @@ static char *get_kdc_ip_string(char *mem_ctx, /* Append to the string - inefficient but not done often. */ kdc_str = print_kdc_line(mem_ctx, kdc_str, - &ip_srv_nonsite[i].ss); + &ip_srv_nonsite[i].ss, + NULL); if (!kdc_str) { SAFE_FREE(ip_srv_site); SAFE_FREE(ip_srv_nonsite); @@ -868,7 +872,8 @@ static char *get_kdc_ip_string(char *mem_ctx, bool create_local_private_krb5_conf_for_domain(const char *realm, const char *domain, const char *sitename, - struct sockaddr_storage *pss) + struct sockaddr_storage *pss, + const char *kdc_name) { char *dname; char *tmpname = NULL; @@ -912,7 +917,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm, realm_upper = talloc_strdup(fname, realm); strupper_m(realm_upper); - kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss); + kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss, kdc_name); if (!kdc_ip_string) { goto done; } diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c index 3b3470dcf3..cebd793537 100644 --- a/source3/libsmb/namequery_dc.c +++ b/source3/libsmb/namequery_dc.c @@ -109,12 +109,14 @@ static bool ads_dc_name(const char *domain, create_local_private_krb5_conf_for_domain(realm, domain, sitename, - &ads->ldap.ss); + &ads->ldap.ss, + ads->config.ldap_server_name); } else { create_local_private_krb5_conf_for_domain(realm, domain, NULL, - &ads->ldap.ss); + &ads->ldap.ss, + ads->config.ldap_server_name); } } #endif diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 45747d4a36..5ea5196508 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1152,7 +1152,8 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx, create_local_private_krb5_conf_for_domain(domain->alt_name, domain->name, sitename, - pss); + pss, + name); SAFE_FREE(sitename); } else { @@ -1160,7 +1161,8 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx, create_local_private_krb5_conf_for_domain(domain->alt_name, domain->name, NULL, - pss); + pss, + name); } winbindd_set_locator_kdc_envs(domain); |