From 6fdde3913a11cd6148627696fa8717c34e8460fc Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Wed, 28 Mar 2012 07:54:26 -0400
Subject: Modified responder_get_domain()

Now it checks for subdomains as well as for the domain itself
---
 src/responder/nss/nsssrv.c          | 2 +-
 src/responder/nss/nsssrv_cmd.c      | 6 +++---
 src/responder/nss/nsssrv_netgroup.c | 2 +-
 src/responder/nss/nsssrv_services.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/responder/nss')

diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c
index f2c893033..1a0dcf439 100644
--- a/src/responder/nss/nsssrv.c
+++ b/src/responder/nss/nsssrv.c
@@ -163,7 +163,7 @@ static int nss_get_config(struct nss_ctx *nctx,
     }
 
     ret = sss_ncache_prepopulate(nctx->ncache, cdb, nctx->rctx->names,
-                                 nctx->rctx->domains);
+                                 nctx->rctx);
     if (ret != EOK) {
         goto done;
     }
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index 50296251b..2c9a08330 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -886,7 +886,7 @@ static int nss_cmd_getpwnam(struct cli_ctx *cctx)
               cmdctx->name, domname?domname:"<ALL>"));
 
     if (domname) {
-        dctx->domain = responder_get_domain(cctx->rctx->domains, domname);
+        dctx->domain = responder_get_domain(dctx, cctx->rctx, domname);
         if (!dctx->domain) {
             ret = ENOENT;
             goto done;
@@ -2203,7 +2203,7 @@ static int nss_cmd_getgrnam(struct cli_ctx *cctx)
               cmdctx->name, domname?domname:"<ALL>"));
 
     if (domname) {
-        dctx->domain = responder_get_domain(cctx->rctx->domains, domname);
+        dctx->domain = responder_get_domain(dctx, cctx->rctx, domname);
         if (!dctx->domain) {
             ret = ENOENT;
             goto done;
@@ -3257,7 +3257,7 @@ static int nss_cmd_initgroups(struct cli_ctx *cctx)
               cmdctx->name, domname?domname:"<ALL>"));
 
     if (domname) {
-        dctx->domain = responder_get_domain(cctx->rctx->domains, domname);
+        dctx->domain = responder_get_domain(dctx, cctx->rctx, domname);
         if (!dctx->domain) {
             ret = ENOENT;
             goto done;
diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c
index c9fae8263..87b105719 100644
--- a/src/responder/nss/nsssrv_netgroup.c
+++ b/src/responder/nss/nsssrv_netgroup.c
@@ -206,7 +206,7 @@ static struct tevent_req *setnetgrent_send(TALLOC_CTX *mem_ctx,
               state->netgr_shortname, domname?domname:"<ALL>"));
 
     if (domname) {
-        dctx->domain = responder_get_domain(client->rctx->domains, domname);
+        dctx->domain = responder_get_domain(dctx, client->rctx, domname);
         if (!dctx->domain) {
             ret = EINVAL;
             goto error;
diff --git a/src/responder/nss/nsssrv_services.c b/src/responder/nss/nsssrv_services.c
index b5eae4fce..2e539f135 100644
--- a/src/responder/nss/nsssrv_services.c
+++ b/src/responder/nss/nsssrv_services.c
@@ -839,7 +839,7 @@ int nss_cmd_getservbyname(struct cli_ctx *cctx)
            domname ? domname : "<ALL>"));
 
     if (domname) {
-        dctx->domain = responder_get_domain(cctx->rctx->domains, domname);
+        dctx->domain = responder_get_domain(dctx, cctx->rctx, domname);
         if (!dctx->domain) {
             ret = ENOENT;
             goto done;
-- 
cgit