winbindd: winbindd_priv_pipe_dir() -> bool_dispatch_table

[samba.git] / source3 / winbindd / idmap_nss.c

diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c
index 941b4d087deb3a6ace3d4d8e9c32815d2c8b041b..3fe98cbc729666e4442565febede3132e922ee06 100644 (file)
--- a/source3/winbindd/idmap_nss.c
+++ b/source3/winbindd/idmap_nss.c
@@ -20,25 +20,26 @@
 */
 
 #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
 #define DBGC_CLASS DBGC_IDMAP
 
 /*****************************
- Initialise idmap database. 
+ Initialise idmap database.
 *****************************/
 
-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;
 }
 
 /**********************************
- lookup a set of unix ids. 
+ lookup a set of unix ids.
 **********************************/
 
 static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
@@ -119,12 +120,11 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_ma
 }
 
 /**********************************
- lookup a set of sids. 
+ lookup a set of sids.
 **********************************/
 
 static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
-       TALLOC_CTX *ctx;
        int i;
 
        /* initialize the status to avoid suprise */
@@ -132,24 +132,20 @@ static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_ma
                ids[i]->status = ID_UNKNOWN;
        }
 
-       ctx = talloc_new(dom);
-       if ( ! ctx) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
        for (i = 0; ids[i]; i++) {
                struct group *gr;
                enum lsa_SidType type;
-               const char *dom_name = NULL;
-               const char *name = NULL;
+               const char *p = NULL;
+               char *name = NULL;
                bool ret;
 
                /* by default calls to winbindd are disabled
                   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,
+                                        &p, &type);
                (void)winbind_off();
+               name = discard_const_p(char, p);
 
                if (!ret) {
                        /* TODO: how do we know if the name is really not mapped,
@@ -190,9 +186,8 @@ static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_ma
                        ids[i]->status = ID_UNKNOWN;
                        break;
                }
+               TALLOC_FREE(name);
        }
-
-       talloc_free(ctx);
        return NT_STATUS_OK;
 }
 
@@ -207,7 +202,7 @@ static struct idmap_methods nss_methods = {
        .sids_to_unixids = idmap_nss_sids_to_unixids,
 };
 
-NTSTATUS idmap_nss_init(void)
+NTSTATUS idmap_nss_init(TALLOC_CTX *mem_ctx)
 {
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "nss", &nss_methods);
 }