Attachment 231531 Details for Bug 232910 – new diffs

[patch] new diffs

cvsdiffs (text/plain), 1.83 KB, created by Rich Megginson on 2007-10-18 20:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-18 20:20:05 UTC

Size: 1.83 KB

patch

obsolete

>Index: ldapserver/ldap/servers/plugins/acl/aclparse.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclparse.c,v
>retrieving revision 1.7
>diff -u -8 -r1.7 aclparse.c
>--- ldapserver/ldap/servers/plugins/acl/aclparse.c	18 Oct 2007 00:08:27 -0000	1.7
>+++ ldapserver/ldap/servers/plugins/acl/aclparse.c	18 Oct 2007 20:19:43 -0000
>@@ -1227,20 +1227,26 @@
> 	Targetattr	**attrArray;
> 	char		*s, *end_attr, *str;
> 	int		len;
> 	Targetattr	*attr = NULL;
> 
> 	s = strchr (attr_val, '=');
> 	s++;
> 	__acl_strip_leading_space(&s);
>+	__acl_strip_trailing_space(s);
> 	len = strlen(s);
> 	if (*s == '"' && s[len-1] == '"') {
> 		s[len-1] = '\0';
> 		s++;
>+	} else {
>+		slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
>+						"__aclp__init_targetattr: Error: The statement does not begin and end with a \": [%s]\n",
>+						s);
>+		return ACL_SYNTAX_ERR;
> 	}
> 
> 	str = s;
> 	attrArray = aci->targetAttr;
> 
> 	if (attrArray[0] != NULL) {
> 		/* 
> 		** That means we are visiting more than once. 
>@@ -1630,22 +1636,25 @@
> 		return ACL_SYNTAX_ERR;
> 	}
> 
>     /* First, skip the "targetattrfilters"  */
>     
>     s = strchr (input_str, '=');
>     s++;							/* skip the = */
>     __acl_strip_leading_space(&s);	/* skip to next significant character */
>+    __acl_strip_trailing_space(s);
>     len = strlen(s);				/* Knock off the " and trailing ) */
> 	if (*s == '"' && s[len-1] == '"') {
> 		s[len-1] = '\0';
> 		s++;						/* skip the first " */
> 	} else {						/* No matching quotes */
>-        	
>+		slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
>+						"__aclp__init_targetattrfilters: Error: The statement does not begin and end with a \": [%s]\n",
>+						s);
>     	return (ACL_SYNTAX_ERR);
>     }
>     
>    	str = s;
>     
>     /* 
>      * Here str looks like add=attr1:F1...attrn:Fn,
>      *					   del=attr1:F1...attrn:Fn

Actions: View | Diff

Attachments on bug 232910: 231501 | 231531 | 231601