Attachment 616710 Details for Bug 814513 – patch with additional debugging statements and workaround

[patch] patch with additional debugging statements and workaround

bz814513.patch (text/plain), 2.87 KB, created by Daniel S. Sterling on 2012-09-24 19:50:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel S. Sterling

Created: 2012-09-24 19:50:29 UTC

Size: 2.87 KB

patch

obsolete

>diff --git a/responder/nss/nsssrv_cmd.c b/responder/nss/nsssrv_cmd.c
>index 6848413..2f76a67 100644
>--- a/responder/nss/nsssrv_cmd.c
>+++ b/responder/nss/nsssrv_cmd.c
>@@ -1545,6 +1545,8 @@ static int nss_cmd_getpwent_immediate(struct nss_cmd_ctx *cmdctx)
>     uint32_t num;
>     int ret;
> 
>+    DEBUG(7, ("nss_cmd_getpwent_immediate called\n"));
>+
>     /* get max num of entries to return in one call */
>     sss_packet_get_body(cctx->creq->in, &body, &blen);
>     if (blen != sizeof(uint32_t)) {
>@@ -1552,6 +1554,13 @@ static int nss_cmd_getpwent_immediate(struct nss_cmd_ctx *cmdctx)
>     }
>     num = *((uint32_t *)body);
> 
>+    DEBUG(7, ("nss_cmd_getpwent_immediate num: %u\n", num));
>+
>+    if (num < 1) {
>+        DEBUG(0, ("nss_cmd_getpwent_immediate returning EINVAL due to num < 1\n"));
>+        return EINVAL;
>+    }
>+
>     /* create response packet */
>     ret = sss_packet_new(cctx->creq, 0,
>                          sss_packet_get_cmd(cctx->creq->in),
>@@ -1577,37 +1586,65 @@ static int nss_cmd_retpwent(struct cli_ctx *cctx, int num)
>     int n = 0;
>     int ret = ENOENT;
> 
>+    DEBUG(7, ("nss_cmd_retpwent called\n"));
>+
>     nctx = talloc_get_type(cctx->rctx->pvt_ctx, struct nss_ctx);
>     if (!nctx->pctx) goto none;
> 
>     pctx = nctx->pctx;
> 
>+    DEBUG(7, ("starting nss_cmd_retpwent loop\n"));
>+    int i = 0;
>+    int old_debug_level = debug_level;
>+
>     while (ret == ENOENT) {
>+        if (i >= 1) debug_level = 7;
>+        DEBUG(7, ("top of nss_cmd_retpwent loop, i: %i\n", i));
>+        if (i >= 100000) break;
>+        i++;
>+
>         if (cctx->pwent_dom_idx >= pctx->num) break;
> 
>         pdom = &pctx->doms[cctx->pwent_dom_idx];
> 
>         n = pdom->res->count - cctx->pwent_cur;
>+        DEBUG(7, ("nss_cmd_retpwent n: %i, pdom->res->count: %u, cctx->pwent_cur: %i\n",
>+            n, pdom->res->count, cctx->pwent_cur));
>+
>         if (n <= 0 && (cctx->pwent_dom_idx+1 < pctx->num)) {
>             cctx->pwent_dom_idx++;
>             pdom = &pctx->doms[cctx->pwent_dom_idx];
>             n = pdom->res->count;
>             cctx->pwent_cur = 0;
>+            DEBUG(7, ("nss_cmd_retpwent n reset, now: %i\n", n));
>         }
> 
>         if (!n) break;
> 
>         if (n > num) n = num;
> 
>+        DEBUG(7, ("nss_cmd_retpwent n: %i, num: %i\n", n, num));
>+
>         msgs = &(pdom->res->msgs[cctx->pwent_cur]);
> 
>         ret = fill_pwent(cctx->creq->out, pdom->domain, nctx, true, msgs, &n);
> 
>         cctx->pwent_cur += n;
>+        DEBUG(7, ("bottom of nss_cmd_retpwent loop\n"));
>+    }
>+
>+    DEBUG(7, ("out of nss_cmd_retpwent loop: ret: %i, i: %i\n", ret, i));
>+
>+    debug_level = old_debug_level;
>+
>+    if (i >= 100000) {
>+        DEBUG(0, ("nss_cmd_retpwent returning EINVAL due to runaway loop check\n"));
>+        return EINVAL;
>     }
> 
> none:
>     if (ret == ENOENT) {
>+        DEBUG(7, ("nss_cmd_retpwent calling fill_empty\n"));
>         ret = fill_empty(cctx->creq->out);
>     }
>     return ret;

Actions: View | Diff

Attachments on bug 814513: 578851 | 616710 | 663060