From a8c0de35f75987c66e2282623a79e88c0ccd74de Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 7 Mar 2014 14:47:31 +0100 Subject: [PATCH] s3-kerberos: remove unused kdc_name from create_local_private_krb5_conf_for_domain(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Guenther Signed-off-by: Günther Deschner Reviewed-by: Andreas Schneider Autobuild-User(master): Günther Deschner Autobuild-Date(master): Fri Mar 7 18:43:57 CET 2014 on sn-devel-104 --- source3/libads/kerberos.c | 10 ++++------ source3/libads/kerberos_proto.h | 3 +-- source3/libnet/libnet_join.c | 3 +-- source3/libsmb/namequery_dc.c | 6 ++---- source3/winbindd/winbindd_cm.c | 6 ++---- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index ea14350e6bc..649e5681a49 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -618,8 +618,7 @@ static void add_sockaddr_unique(struct sockaddr_storage *addrs, int *num_addrs, static char *get_kdc_ip_string(char *mem_ctx, const char *realm, const char *sitename, - const struct sockaddr_storage *pss, - const char *kdc_name) + const struct sockaddr_storage *pss) { TALLOC_CTX *frame = talloc_stackframe(); int i; @@ -756,8 +755,7 @@ fail: bool create_local_private_krb5_conf_for_domain(const char *realm, const char *domain, const char *sitename, - const struct sockaddr_storage *pss, - const char *kdc_name) + const struct sockaddr_storage *pss) { char *dname; char *tmpname = NULL; @@ -782,7 +780,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm, return false; } - if (domain == NULL || pss == NULL || kdc_name == NULL) { + if (domain == NULL || pss == NULL) { return false; } @@ -815,7 +813,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm, goto done; } - kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss, kdc_name); + kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss); if (!kdc_ip_string) { goto done; } diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h index f7470d2f81e..255963405c7 100644 --- a/source3/libads/kerberos_proto.h +++ b/source3/libads/kerberos_proto.h @@ -62,8 +62,7 @@ int kerberos_kinit_password(const char *principal, bool create_local_private_krb5_conf_for_domain(const char *realm, const char *domain, const char *sitename, - const struct sockaddr_storage *pss, - const char *kdc_name); + const struct sockaddr_storage *pss); /* The following definitions come from libads/authdata.c */ diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index a87eb382d6b..68884cd8a86 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -2152,8 +2152,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx, create_local_private_krb5_conf_for_domain( r->out.dns_domain_name, r->out.netbios_domain_name, - NULL, smbXcli_conn_remote_sockaddr(cli->conn), - smbXcli_conn_remote_name(cli->conn)); + NULL, smbXcli_conn_remote_sockaddr(cli->conn)); if (r->out.domain_is_ad && r->in.account_ou && !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) { diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c index 3cfae79257e..eb34741defa 100644 --- a/source3/libsmb/namequery_dc.c +++ b/source3/libsmb/namequery_dc.c @@ -112,14 +112,12 @@ static bool ads_dc_name(const char *domain, create_local_private_krb5_conf_for_domain(realm, domain, sitename, - &ads->ldap.ss, - ads->config.ldap_server_name); + &ads->ldap.ss); } else { create_local_private_krb5_conf_for_domain(realm, domain, NULL, - &ads->ldap.ss, - ads->config.ldap_server_name); + &ads->ldap.ss); } } #endif diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 669a43e5ac3..be13a57e9ea 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1233,8 +1233,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx, create_local_private_krb5_conf_for_domain(domain->alt_name, domain->name, sitename, - pss, - *name); + pss); TALLOC_FREE(sitename); } else { @@ -1242,8 +1241,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx, create_local_private_krb5_conf_for_domain(domain->alt_name, domain->name, NULL, - pss, - *name); + pss); } winbindd_set_locator_kdc_envs(domain); -- 2.34.1