sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r11704: methods->alternate_name is not used anymore -- remove it

Browse Source
This commit is contained in:
Volker Lendecke 2005-11-12 18:22:12 +00:00 committed by Gerald (Jerry) Carter
parent 61e7366e0f
commit 4a4f85f0ef
6 changed files with 0 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/nsswitch/winbindd.h
View File

@ -275,9 +275,6 @@ struct winbindd_methods {
char ***names,
char ***alt_names,
DOM_SID **dom_sids);
/* setup the list of alternate names for the domain, if any */
NTSTATUS (*alternate_name)(struct winbindd_domain *domain);
};
/* Used to glue a policy handle and cli_state together */

37
source/nsswitch/winbindd_ads.c
View File

@ -933,42 +933,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
return result;
}
/* find alternate names list for the domain - for ADS this is the
netbios name */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
ADS_STRUCT *ads;
ADS_STATUS rc;
TALLOC_CTX *ctx;
const char *workgroup;
DEBUG(3,("ads: alternate_name\n"));
ads = ads_cached_connection(domain);
if (!ads) {
domain->last_status = NT_STATUS_SERVER_DISABLED;
return NT_STATUS_UNSUCCESSFUL;
}
if (!(ctx = talloc_init("alternate_name"))) {
return NT_STATUS_NO_MEMORY;
}
rc = ads_workgroup_name(ads, ctx, &workgroup);
if (ADS_ERR_OK(rc)) {
fstrcpy(domain->name, workgroup);
fstrcpy(domain->alt_name, ads->config.realm);
strupper_m(domain->alt_name);
strupper_m(domain->name);
}
talloc_destroy(ctx);
return ads_ntstatus(rc);
}
/* the ADS backend methods are exposed via this structure */
struct winbindd_methods ads_methods = {
True,
@ -983,7 +947,6 @@ struct winbindd_methods ads_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
alternate_name
};
#endif

13
source/nsswitch/winbindd_cache.c
View File

@ -1401,18 +1401,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
names, alt_names, dom_sids);
}
/* find the alternate names for the domain, if any */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
get_cache(domain);
DEBUG(10,("alternate_name: [Cached] - doing backend query for info for domain %s\n",
domain->name ));
/* we don't cache this call */
return domain->backend->alternate_name(domain);
}
/* Invalidate cached user and group lists coherently */
static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf,
@ -1467,7 +1455,6 @@ struct winbindd_methods cache_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
alternate_name
};
static BOOL init_wcache(void)

12
source/nsswitch/winbindd_passdb.c
View File

@ -378,17 +378,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
return nt_status;
}
/* find alternate names list for the domain
* should we look for netbios aliases??
SSS */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
DEBUG(3,("pdb: alternate_name\n"));
return NT_STATUS_OK;
}
/* the rpc backend methods are exposed via this structure */
struct winbindd_methods passdb_methods = {
False,
@ -403,5 +392,4 @@ struct winbindd_methods passdb_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
alternate_name
};

14
source/nsswitch/winbindd_reconnect.c
View File

@ -242,19 +242,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
return result;
}
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
NTSTATUS result;
result = msrpc_methods.alternate_name(domain);
if (NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))
result = msrpc_methods.alternate_name(domain);
return result;
}
/* the rpc backend methods are exposed via this structure */
struct winbindd_methods reconnect_methods = {
False,
@ -269,5 +256,4 @@ struct winbindd_methods reconnect_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
alternate_name
};

8
source/nsswitch/winbindd_rpc.c
View File

@ -883,13 +883,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
return result;
}
/* find alternate names list for the domain - none for rpc */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
return NT_STATUS_OK;
}
/* the rpc backend methods are exposed via this structure */
struct winbindd_methods msrpc_methods = {
False,
@ -904,5 +897,4 @@ struct winbindd_methods msrpc_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
alternate_name
};