Use a unified base (temp. dc=sssd), for all domain including LOCAL.

It makes no sense to have internal attribute names user configurable,
remove that option and use macros internally.

Also now always pass the domain name to all nss_ldb_* calls.

1 files changed, 24 insertions, 28 deletions

diff --git a/server/nss/nsssrv_ldb.h b/server/nss/nsssrv_ldb.h
index 016f5a54c..66c9687d2 100644
--- a/server/nss/nsssrv_ldb.h
+++ b/server/nss/nsssrv_ldb.h
@@ -1,39 +1,30 @@
+/*
+   SSSD
 
-struct nss_ldb_ctx {
-    struct ldb_context *ldb;
-    const char *ldb_file;
-
-    const char *user_base;
-    const char *group_base;
+   NSS LDB Header
 
-    const char *pwnam_filter;
-    const char *pwuid_filter;
-    const char *pwent_filter;
+   Copyright (C) Simo Sorce <ssorce@redhat.com>	2008
 
-    const char *grnam_filter;
-    const char *grna2_filter;
-    const char *grgid_filter;
-    const char *grent_filter;
+   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.
 
-    const char *initgr_filter;
+   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.
 
-    const char *pw_name;
-    const char *pw_uidnum;
-    const char *pw_gidnum;
-    const char *pw_fullname;
-    const char *pw_homedir;
-    const char *pw_shell;
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-    const char *gr_name;
-    const char *gr_gidnum;
-    const char *gr_member;
 
-    const char *initgr_attr;
+#include "nss/nss_ldb.h"
 
-    const char **pw_attrs;
-    const char **grnam_attrs;
-    const char **grpw_attrs;
-    const char **initgr_attrs;
+struct nss_ldb_ctx {
+    struct ldb_context *ldb;
+    const char *ldb_file;
 };
 
 struct confdb_ctx;
@@ -48,12 +39,14 @@ int nss_ldb_init(TALLOC_CTX *mem_ctx,
 int nss_ldb_getpwnam(TALLOC_CTX *mem_ctx,
                      struct event_context *ev,
                      struct nss_ldb_ctx *ctx,
+                     const char *domain,
                      const char *name,
                      nss_ldb_callback_t fn, void *ptr);
 
 int nss_ldb_getpwuid(TALLOC_CTX *mem_ctx,
                      struct event_context *ev,
                      struct nss_ldb_ctx *ctx,
+                     const char *domain,
                      uint64_t uid,
                      nss_ldb_callback_t fn, void *ptr);
 
@@ -65,12 +58,14 @@ int nss_ldb_enumpwent(TALLOC_CTX *mem_ctx,
 int nss_ldb_getgrnam(TALLOC_CTX *mem_ctx,
                      struct event_context *ev,
                      struct nss_ldb_ctx *ctx,
+                     const char *domain,
                      const char *name,
                      nss_ldb_callback_t fn, void *ptr);
 
 int nss_ldb_getgrgid(TALLOC_CTX *mem_ctx,
                      struct event_context *ev,
                      struct nss_ldb_ctx *ctx,
+                     const char *domain,
                      uint64_t gid,
                      nss_ldb_callback_t fn, void *ptr);
 
@@ -82,6 +77,7 @@ int nss_ldb_enumgrent(TALLOC_CTX *mem_ctx,
 int nss_ldb_initgroups(TALLOC_CTX *mem_ctx,
                        struct event_context *ev,
                        struct nss_ldb_ctx *ctx,
+                       const char *domain,
                        const char *name,
                        nss_ldb_callback_t fn, void *ptr);