Changeset 745 for trunk/server/source3/winbindd/idmap_nss.c

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_nss.c (modified) (14 diffs)

trunk/server/source3/winbindd/idmap_nss.c

@@ -2 +2 @@
    Unix SMB/CIFS implementation.
 
-   idmap PASSDB backend
+   idmap NSS backend
 
    Copyright (C) Simo Sorce 2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -21 +21 @@
 
 #include "includes.h"
+#include "system/passwd.h"
 #include "winbindd.h"
+#include "nsswitch/winbind_client.h"
+#include "idmap.h"
+#include "lib/winbind_util.h"
 
 #undef DBGC_CLASS
@@ -30 +34 @@
 *****************************/
 
-static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom,
-                                   const char *params)
+static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom)
 {       
         return NT_STATUS_OK;
@@ -42 +45 @@
 static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
 {
-        TALLOC_CTX *ctx;
         int i;
 
@@ -48 +50 @@
         for (i = 0; ids[i]; i++) {
                 ids[i]->status = ID_UNKNOWN;
-        }
-        
-        ctx = talloc_new(dom);
-        if ( ! ctx) {
-                DEBUG(0, ("Out of memory!\n"));
-                return NT_STATUS_NO_MEMORY;
         }
 
@@ -62 +58 @@
                 enum lsa_SidType type;
                 bool ret;
-                
+
                 switch (ids[i]->xid.type) {
                 case ID_TYPE_UID:
@@ -121 +117 @@
                 }
         }
-
-
-        talloc_free(ctx);
         return NT_STATUS_OK;
 }
@@ -133 +126 @@
 static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
-        TALLOC_CTX *ctx;
         int i;
 
@@ -139 +131 @@
         for (i = 0; ids[i]; i++) {
                 ids[i]->status = ID_UNKNOWN;
-        }
-        
-        ctx = talloc_new(dom);
-        if ( ! ctx) {
-                DEBUG(0, ("Out of memory!\n"));
-                return NT_STATUS_NO_MEMORY;
         }
 
@@ -150 +136 @@
                 struct group *gr;
                 enum lsa_SidType type;
-                const char *dom_name = NULL;
-                const char *name = NULL;
+                char *name = NULL;
                 bool ret;
 
@@ -157 +142 @@
                    the following call will not recurse so this is safe */
                 (void)winbind_on();
-                ret = winbind_lookup_sid(ctx, ids[i]->sid, &dom_name, &name, &type);
+                ret = winbind_lookup_sid(talloc_tos(), ids[i]->sid, NULL,
+                                         (const char **)&name, &type);
                 (void)winbind_off();
 
@@ -199 +185 @@
                         break;
                 }
-        }
-
-        talloc_free(ctx);
+                TALLOC_FREE(name);
+        }
         return NT_STATUS_OK;
 }
@@ -209 +194 @@
 **********************************/
 
-static NTSTATUS idmap_nss_close(struct idmap_domain *dom)
-{
-        return NT_STATUS_OK;
-}
-
 static struct idmap_methods nss_methods = {
 
@@ -219 +199 @@
         .unixids_to_sids = idmap_nss_unixids_to_sids,
         .sids_to_unixids = idmap_nss_sids_to_unixids,
-        .close_fn = idmap_nss_close
 };