r6755: removing domain_sid() since it is not referenced anymore

(This used to be commit 8104149e6f490fa1a298e61becc8df01ddd92008)

diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 863ae35fed4a999102ed0e25f03ba75a5e65fe98..aed0c00c9d9eddc4b1eb6d3007fdc74158667962 100644 (file)
--- 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 4daf4ba989085ed8ed31fad0d098711148fe01d9..5f23e755d4c6148b81ddda59e5bdc83314007ce6 100644 (file)
--- 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 73378eb81ee1d43432253146fdc07e1779abda69..e036de72a70c0d1392aedb6a3222fea13733d894 100644 (file)
--- 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 23a56e4ea637a2c8b1451acb6f5ca26854b87081..f0484d35eeffa9e718ab5ca4152862e672b9c2fe 100644 (file)
--- 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 faf5a1161fdfed878254f2cbecd64ad33d357c82..854688da4e8cd67c18d45ad6c2aa5050037ff01d 100644 (file)
--- 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
 };