Attachment 313120 Details for Bug 457156 – cvs diff ldap/servers/plugins/acl/acleffectiverights.c

[patch] cvs diff ldap/servers/plugins/acl/acleffectiverights.c

acleffectiverights.c.diff (text/plain), 3.00 KB, created by Noriko Hosoi on 2008-07-31 17:21:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2008-07-31 17:21:25 UTC

Size: 3.00 KB

patch

obsolete

>Index: acleffectiverights.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acleffectiverights.c,v
>retrieving revision 1.10
>diff -t -w -U4 -r1.10 acleffectiverights.c
>--- acleffectiverights.c	28 Jul 2008 15:49:28 -0000	1.10
>+++ acleffectiverights.c	31 Jul 2008 17:15:28 -0000
>@@ -810,8 +810,9 @@
>         char *templateentry = NULL;
>         char *object = NULL;
>         char *superior = NULL;
>         char *p = NULL;
>+        char *dn = NULL;
>         int siz = 0;
>         int len = 0;
>         int i = 0;
>         int notfirst = 0;
>@@ -825,8 +826,10 @@
>                                                 "in the attr list, e.g., \"*@person\"\n");
>                 rc = LDAP_SUCCESS;
>                 goto bailout;
>         }
>+        /* get the target dn where the template entry is located */
>+        slapi_pblock_get( pb, SLAPI_TARGET_DN, &dn );
>         for (i = 0; gerattrs && gerattrs[i]; i++)
>         {
>                 object = strchr(gerattrs[i], '@');
>                 if (NULL != object && '\0' != *(++object))
>@@ -854,16 +857,25 @@
>                         siz += strlen(attrs[i]) + 4 + strlen(object);
>                 }
>                 else
>                 {
>-                        /* <*attrp>: dummy\n\0 */
>-                        siz += strlen(attrs[i]) + 4 + 5;
>+                        /* <*attrp>: (template_attribute)\n\0 */
>+                        siz += strlen(attrs[i]) + 4 + 20;
>                 }
>         }
>-        siz += 32 + strlen(object); /* dn: cn=<template_name>\n\0 */
>+        if (dn)
>+        {
>+                /* dn: cn=<template_name>,<dn>\n\0 */
>+                siz += 32 + strlen(object) + strlen(dn);
>+        }
>+        else
>+        {
>+                /* dn: cn=<template_name>\n\0 */
>+                siz += 32 + strlen(object);
>+        }
>         templateentry = (char *)slapi_ch_malloc(siz);
>         PR_snprintf(templateentry, siz,
>-                                        "dn: cn=template_%s_objectclass\n", object);
>+                "dn: cn=template_%s_objectclass%s%s\n", object, dn?",":"", dn?dn:"");
>         for (--i; i >= 0; i--)
>         {
>                 len = strlen(templateentry);
>                 p = templateentry + len;
>@@ -872,9 +884,9 @@
>                         PR_snprintf(p, siz - len, "%s: %s\n", attrs[i], object);
>                 }
>                 else
>                 {
>-                        PR_snprintf(p, siz - len, "%s: dummy\n", attrs[i]);
>+                        PR_snprintf(p, siz - len, "%s: (template_attribute)\n", attrs[i]);
>                 }
>         }
>         charray_free(attrs);
> 
>@@ -908,8 +920,12 @@
>                         }
>                 }
>                 charray_free(attrs);
>         }
>+        if (notfirst)
>+        {
>+                slapi_ch_free_string(&object);
>+        }
>         slapi_ch_free_string(&superior);
>         siz += 18; /* objectclass: top\n\0 */
>         len = strlen(templateentry);
>         templateentry = (char *)slapi_ch_realloc(templateentry, siz);

Actions: View | Diff

Attachments on bug 457156: 312947 | 313006 | 313120 | 313121 | 313136 | 313137 | 313854 | 313980