Changeset 745 for trunk/server/source3/winbindd/idmap_hash

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/idmap_hash/idmap_hash.c (modified) (14 diffs)
• source3/winbindd/idmap_hash/mapfile.c (modified) (1 diff)

trunk/server/source3/winbindd/idmap_hash/idmap_hash.c

@@ -21 +21 @@
 #include "includes.h"
 #include "winbindd/winbindd.h"
+#include "idmap.h"
 #include "idmap_hash.h"
+#include "ads.h"
+#include "nss_info.h"
+#include "../libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
@@ -27 +31 @@
 
 struct sid_hash_table {
-        DOM_SID *sid;
+        struct dom_sid *sid;
 };
 
-struct sid_hash_table *hashed_domains = NULL;
-
 /*********************************************************************
  Hash a domain SID (S-1-5-12-aaa-bbb-ccc) to a 12bit number
  ********************************************************************/
 
-static uint32_t hash_domain_sid(const DOM_SID *sid)
+static uint32_t hash_domain_sid(const struct dom_sid *sid)
 {
         uint32_t hash;
@@ -103 +105 @@
  ********************************************************************/
 
-static NTSTATUS be_init(struct idmap_domain *dom,
-                        const char *params)
-{
+static NTSTATUS be_init(struct idmap_domain *dom)
+{
+        struct sid_hash_table *hashed_domains;
         NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
         struct winbindd_tdc_domain *dom_list = NULL;
@@ -111 +113 @@
         int i;
 
-        /* If the domain SID hash talbe has been initialized, assume
+        /* If the domain SID hash table has been initialized, assume
            that we completed this function previously */
 
-        if ( hashed_domains ) {
+        if (dom->private_data != NULL) {
                 nt_status = NT_STATUS_OK;
                 goto done;
@@ -126 +128 @@
         /* Create the hash table of domain SIDs */
 
-        hashed_domains = TALLOC_ZERO_ARRAY(NULL, struct sid_hash_table, 4096);
+        hashed_domains = TALLOC_ZERO_ARRAY(dom, struct sid_hash_table, 4096);
         BAIL_ON_PTR_NT_ERROR(hashed_domains, nt_status);
 
@@ -144 +146 @@
                          hash));
 
-                hashed_domains[hash].sid = talloc(hashed_domains, DOM_SID);
+                hashed_domains[hash].sid = talloc(hashed_domains, struct dom_sid);
                 sid_copy(hashed_domains[hash].sid, &dom_list[i].sid);
         }
+
+        dom->private_data = hashed_domains;
 
 done:
@@ -158 +162 @@
                                 struct id_map **ids)
 {
+        struct sid_hash_table *hashed_domains = talloc_get_type_abort(
+                dom->private_data, struct sid_hash_table);
         NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
         int i;
@@ -165 +171 @@
                 ids[i]->status = ID_UNKNOWN;
         }
-        
-        nt_status = be_init(dom, NULL);
+
+        nt_status = be_init(dom);
         BAIL_ON_NTSTATUS_ERROR(nt_status);
 
@@ -194 +200 @@
                         continue;
 
-                sid_copy(ids[i]->sid, hashed_domains[h_domain].sid);
-                sid_append_rid(ids[i]->sid, h_rid);
+                sid_compose(ids[i]->sid, hashed_domains[h_domain].sid, h_rid);
                 ids[i]->status = ID_MAPPED;
         }
@@ -216 +221 @@
                 ids[i]->status = ID_UNKNOWN;
         }
-        
-        nt_status = be_init(dom, NULL);
+
+        nt_status = be_init(dom);
         BAIL_ON_NTSTATUS_ERROR(nt_status);
 
@@ -226 +231 @@
 
         for (i=0; ids[i]; i++) {
-                DOM_SID sid;
+                struct dom_sid sid;
                 uint32_t rid;
                 uint32_t h_domain, h_rid;
@@ -253 +258 @@
  ********************************************************************/
 
-static NTSTATUS be_close(struct idmap_domain *dom)
-{
-        if (hashed_domains)
-                talloc_free(hashed_domains);
-
-        return NT_STATUS_OK;
-}
-
-/*********************************************************************
- ********************************************************************/
-
 static NTSTATUS nss_hash_init(struct nss_domain_entry *e )
 {
-        return be_init(NULL, NULL);
+        return be_init(NULL);
 }
 
@@ -273 +267 @@
 
 static NTSTATUS nss_hash_get_info(struct nss_domain_entry *e,
-                                    const DOM_SID *sid,
+                                    const struct dom_sid *sid,
                                     TALLOC_CTX *ctx,
-                                    ADS_STRUCT *ads,
-                                    LDAPMessage *msg,
                                     const char **homedir,
                                     const char **shell,
@@ -359 +351 @@
         .unixids_to_sids = unixids_to_sids,
         .sids_to_unixids = sids_to_unixids,
-        .close_fn        = be_close
 };
 

trunk/server/source3/winbindd/idmap_hash/mapfile.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "winbindd/winbindd.h"
+#include "idmap.h"
 #include "idmap_hash.h"
 #include <stdio.h>