summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-11-12 18:22:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:24 -0500
commit789bed878aa94edf22521c6c1946d3ab73462516 (patch)
treea7aeff31da44e8051d7c86c5206f6525df8c258a /source3/nsswitch
parentf8cb37ab19cc9499c23a1e1f40427ed48b707870 (diff)
downloadsamba-789bed878aa94edf22521c6c1946d3ab73462516.tar.gz
samba-789bed878aa94edf22521c6c1946d3ab73462516.tar.bz2
samba-789bed878aa94edf22521c6c1946d3ab73462516.zip
r11704: methods->alternate_name is not used anymore -- remove it
(This used to be commit 4a4f85f0ef8545b7062e9a49392d4488aa108036)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd.h3
-rw-r--r--source3/nsswitch/winbindd_ads.c37
-rw-r--r--source3/nsswitch/winbindd_cache.c13
-rw-r--r--source3/nsswitch/winbindd_passdb.c12
-rw-r--r--source3/nsswitch/winbindd_reconnect.c14
-rw-r--r--source3/nsswitch/winbindd_rpc.c8
6 files changed, 0 insertions, 87 deletions
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 3adf7717d6..00a0233055 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -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 */
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 32bc641b6a..ac24b35229 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -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
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 83ded01d4e..2d03e452ad 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -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)
diff --git a/source3/nsswitch/winbindd_passdb.c b/source3/nsswitch/winbindd_passdb.c
index 238e80f31b..c32aa01a38 100644
--- a/source3/nsswitch/winbindd_passdb.c
+++ b/source3/nsswitch/winbindd_passdb.c
@@ -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
};
diff --git a/source3/nsswitch/winbindd_reconnect.c b/source3/nsswitch/winbindd_reconnect.c
index 1a90717db3..77df9c1513 100644
--- a/source3/nsswitch/winbindd_reconnect.c
+++ b/source3/nsswitch/winbindd_reconnect.c
@@ -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
};
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index 63e2487700..6179189e30 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -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
};