summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-05-12 13:09:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:53 -0500
commit5906b27ab5f425d737b94d02a9855205cb55c409 (patch)
treedc5542ab8236af4cf6e2dfaee16c655c1ed7696d /source3
parentd5e18ed8fdd114baa6e0060447dd46ae9fe3066a (diff)
downloadsamba-5906b27ab5f425d737b94d02a9855205cb55c409.tar.gz
samba-5906b27ab5f425d737b94d02a9855205cb55c409.tar.bz2
samba-5906b27ab5f425d737b94d02a9855205cb55c409.zip
r6755: removing domain_sid() since it is not referenced anymore
(This used to be commit 8104149e6f490fa1a298e61becc8df01ddd92008)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/winbindd.h4
-rw-r--r--source3/nsswitch/winbindd_ads.c31
-rw-r--r--source3/nsswitch/winbindd_cache.c13
-rw-r--r--source3/nsswitch/winbindd_passdb.c8
-rw-r--r--source3/nsswitch/winbindd_rpc.c39
5 files changed, 0 insertions, 95 deletions
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 863ae35fed..aed0c00c9d 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -210,10 +210,6 @@ struct winbindd_methods {
char ***alt_names,
DOM_SID **dom_sids);
- /* find the domain sid */
- NTSTATUS (*domain_sid)(struct winbindd_domain *domain,
- DOM_SID *sid);
-
/* setup the list of alternate names for the domain, if any */
NTSTATUS (*alternate_name)(struct winbindd_domain *domain);
};
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 4daf4ba989..5f23e755d4 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -892,36 +892,6 @@ done:
return result;
}
-/* find the domain sid for a domain */
-static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
-{
- ADS_STRUCT *ads;
- ADS_STATUS rc;
-
- DEBUG(3,("ads: domain_sid\n"));
-
- ads = ads_cached_connection(domain);
-
- if (!ads) {
- domain->last_status = NT_STATUS_SERVER_DISABLED;
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- rc = ads_domain_sid(ads, sid);
-
- if (!ADS_ERR_OK(rc)) {
-
- /* its a dead connection; don't destroy it though
- since that has already been done indirectly
- by ads_domain_sid() */
-
- domain->private = NULL;
- }
-
- return ads_ntstatus(rc);
-}
-
-
/* find alternate names list for the domain - for ADS this is the
netbios name */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
@@ -972,7 +942,6 @@ struct winbindd_methods ads_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
- domain_sid,
alternate_name
};
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 73378eb81e..e036de72a7 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -1398,18 +1398,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
names, alt_names, dom_sids);
}
-/* find the domain sid */
-static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
-{
- get_cache(domain);
-
- DEBUG(10,("domain_sid: [Cached] - doing backend query for info for domain %s\n",
- domain->name ));
-
- /* we don't cache this call */
- return domain->backend->domain_sid(domain, sid);
-}
-
/* find the alternate names for the domain, if any */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
@@ -1476,6 +1464,5 @@ struct winbindd_methods cache_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
- domain_sid,
alternate_name
};
diff --git a/source3/nsswitch/winbindd_passdb.c b/source3/nsswitch/winbindd_passdb.c
index 23a56e4ea6..f0484d35ee 100644
--- a/source3/nsswitch/winbindd_passdb.c
+++ b/source3/nsswitch/winbindd_passdb.c
@@ -373,13 +373,6 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
return nt_status;
}
-/* find the domain sid for a domain */
-static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
-{
- sid_copy(sid, &domain->sid);
- return NT_STATUS_OK;
-}
-
/* find alternate names list for the domain
* should we look for netbios aliases??
SSS */
@@ -405,6 +398,5 @@ struct winbindd_methods passdb_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
- domain_sid,
alternate_name
};
diff --git a/source3/nsswitch/winbindd_rpc.c b/source3/nsswitch/winbindd_rpc.c
index faf5a1161f..854688da4e 100644
--- a/source3/nsswitch/winbindd_rpc.c
+++ b/source3/nsswitch/winbindd_rpc.c
@@ -1021,44 +1021,6 @@ done:
return result;
}
-/* find the domain sid for a domain */
-static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
-{
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- TALLOC_CTX *mem_ctx;
- CLI_POLICY_HND *hnd;
- char *level5_dom;
- DOM_SID *alloc_sid;
- int retry;
-
- DEBUG(3,("rpc: domain_sid\n"));
-
- if (!(mem_ctx = talloc_init("domain_sid[rpc]")))
- return NT_STATUS_NO_MEMORY;
-
- retry = 0;
- do {
- /* Get lsa handle */
- if (!NT_STATUS_IS_OK(result = cm_get_lsa_handle(domain, &hnd)))
- goto done;
-
- result = cli_lsa_query_info_policy(hnd->cli, mem_ctx,
- &hnd->pol, 0x05, &level5_dom, &alloc_sid);
- } while (!NT_STATUS_IS_OK(result) && (retry++ < 1) && hnd && hnd->cli && hnd->cli->fd == -1);
-
- if (NT_STATUS_IS_OK(result)) {
- if (alloc_sid) {
- sid_copy(sid, alloc_sid);
- } else {
- result = NT_STATUS_NO_MEMORY;
- }
- }
-
-done:
- talloc_destroy(mem_ctx);
- return result;
-}
-
/* find alternate names list for the domain - none for rpc */
static NTSTATUS alternate_name(struct winbindd_domain *domain)
{
@@ -1080,6 +1042,5 @@ struct winbindd_methods msrpc_methods = {
lookup_groupmem,
sequence_number,
trusted_domains,
- domain_sid,
alternate_name
};