s3-kerberos: remove unused kdc_name from create_local_private_krb5_conf_for_domain().
authorGünther Deschner <gd@samba.org>
Fri, 7 Mar 2014 13:47:31 +0000 (14:47 +0100)
committerGünther Deschner <gd@samba.org>
Fri, 7 Mar 2014 17:43:57 +0000 (18:43 +0100)
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Fri Mar  7 18:43:57 CET 2014 on sn-devel-104

source3/libads/kerberos.c
source3/libads/kerberos_proto.h
source3/libnet/libnet_join.c
source3/libsmb/namequery_dc.c
source3/winbindd/winbindd_cm.c

index ea14350e6bc7f04d95c916118a0611d629e5f993..649e5681a493f7c4a5fd4ce19ee02149163b4666 100644 (file)
@@ -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,
 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;
 {
        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,
 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;
 {
        char *dname;
        char *tmpname = NULL;
@@ -782,7 +780,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
                return false;
        }
 
                return false;
        }
 
-       if (domain == NULL || pss == NULL || kdc_name == NULL) {
+       if (domain == NULL || pss == NULL) {
                return false;
        }
 
                return false;
        }
 
@@ -815,7 +813,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
                goto done;
        }
 
                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;
        }
        if (!kdc_ip_string) {
                goto done;
        }
index f7470d2f81ecc17fab5b06887652352df86264be..255963405c7dfd1142d3f568bf300860c8953817 100644 (file)
@@ -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,
 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  */
 
 
 /* The following definitions come from libads/authdata.c  */
 
index a87eb382d6bf2ff6dea2307f091b7c84592a0e31..68884cd8a86d71bd8a1bd9c6416e831b8c96f317 100644 (file)
@@ -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,
 
        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)) {
 
        if (r->out.domain_is_ad && r->in.account_ou &&
            !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {
index 3cfae79257ec310ab0a857245f115882b8681437..eb34741defa34c775601384ea28e81fa2630df5a 100644 (file)
@@ -112,14 +112,12 @@ static bool ads_dc_name(const char *domain,
                                create_local_private_krb5_conf_for_domain(realm,
                                                                        domain,
                                                                        sitename,
                                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,
                        } else {
                                create_local_private_krb5_conf_for_domain(realm,
                                                                        domain,
                                                                        NULL,
-                                                                       &ads->ldap.ss,
-                                                                       ads->config.ldap_server_name);
+                                                                       &ads->ldap.ss);
                        }
                }
 #endif
                        }
                }
 #endif
index 669a43e5ac35e771b6d081180ef4f7711a110c40..be13a57e9eafdaae625b9d493c20dee52719b30b 100644 (file)
@@ -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,
                                        create_local_private_krb5_conf_for_domain(domain->alt_name,
                                                                        domain->name,
                                                                        sitename,
-                                                                       pss,
-                                                                       *name);
+                                                                       pss);
 
                                        TALLOC_FREE(sitename);
                                } else {
 
                                        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,
                                        create_local_private_krb5_conf_for_domain(domain->alt_name,
                                                                        domain->name,
                                                                        NULL,
-                                                                       pss,
-                                                                       *name);
+                                                                       pss);
                                }
                                winbindd_set_locator_kdc_envs(domain);
 
                                }
                                winbindd_set_locator_kdc_envs(domain);