sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3-kerberos: remove unused kdc_name from create_local_private_krb5_conf_for_domain().

Browse Source 
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
This commit is contained in:
Günther Deschner 2014-03-07 14:47:31 +01:00
parent 168627e187
commit a8c0de35f7
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/libads/kerberos.c
View 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,
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;
}

3
source3/libads/kerberos_proto.h
View 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,
const struct sockaddr_storage *pss,
const char *kdc_name);
const struct sockaddr_storage *pss);
/* The following definitions come from libads/authdata.c */

3
source3/libnet/libnet_join.c
View 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,
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)) {

6
source3/libsmb/namequery_dc.c
View File

@ -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

6
source3/winbindd/winbindd_cm.c
View 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,
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);