s3-includes: only include system/passwd.h when needed.

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

diff --git a/source3/winbindd/idmap_nss.c b/source3/winbindd/idmap_nss.c
index c4115b1ee3ade277e8bbf48b2e9f772ec7c06987..5cd2bc24c36cc9053440297087c431688a14e9fd 100644 (file)
--- a/source3/winbindd/idmap_nss.c
+++ b/source3/winbindd/idmap_nss.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
 
-   idmap PASSDB backend
+   idmap NSS backend
 
    Copyright (C) Simo Sorce 2006
 
@@ -20,7 +20,11 @@
 */
 
 #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
@@ -31,7 +35,6 @@
 
 static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom)
 {      
-       dom->initialized = True;
        return NT_STATUS_OK;
 }
 
@@ -41,17 +44,11 @@ static NTSTATUS idmap_nss_int_init(struct idmap_domain *dom)
 
 static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_map **ids)
 {
-       TALLOC_CTX *ctx;
        int i;
 
-       if (! dom->initialized) {
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       ctx = talloc_new(dom);
-       if ( ! ctx) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
+       /* initialize the status to avoid suprise */
+       for (i = 0; ids[i]; i++) {
+               ids[i]->status = ID_UNKNOWN;
        }
 
        for (i = 0; ids[i]; i++) {
@@ -119,9 +116,6 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_ma
                        break;
                }
        }
-
-
-       talloc_free(ctx);
        return NT_STATUS_OK;
 }
 
@@ -131,30 +125,24 @@ static NTSTATUS idmap_nss_unixids_to_sids(struct idmap_domain *dom, struct id_ma
 
 static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
-       TALLOC_CTX *ctx;
        int i;
 
-       if (! dom->initialized) {
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       ctx = talloc_new(dom);
-       if ( ! ctx) {
-               DEBUG(0, ("Out of memory!\n"));
-               return NT_STATUS_NO_MEMORY;
+       /* initialize the status to avoid suprise */
+       for (i = 0; ids[i]; i++) {
+               ids[i]->status = ID_UNKNOWN;
        }
 
        for (i = 0; ids[i]; i++) {
                struct group *gr;
                enum lsa_SidType type;
-               const char *dom_name = NULL;
-               const char *name = 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,
+                                        (const char **)&name, &type);
                (void)winbind_off();
 
                if (!ret) {
@@ -196,9 +184,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;
 }
 
@@ -206,17 +193,11 @@ static NTSTATUS idmap_nss_sids_to_unixids(struct idmap_domain *dom, struct id_ma
  Close the idmap tdb instance
 **********************************/
 
-static NTSTATUS idmap_nss_close(struct idmap_domain *dom)
-{
-       return NT_STATUS_OK;
-}
-
 static struct idmap_methods nss_methods = {
 
        .init = idmap_nss_int_init,
        .unixids_to_sids = idmap_nss_unixids_to_sids,
        .sids_to_unixids = idmap_nss_sids_to_unixids,
-       .close_fn = idmap_nss_close
 };
 
 NTSTATUS idmap_nss_init(void)