Attachment 157357 Details for Bug 244772 – patch resolving the issue

[patch] patch resolving the issue

openldap-2.2.13-acl-parse.patch (text/plain), 3.77 KB, created by Jan Safranek on 2007-06-19 10:21:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Safranek

Created: 2007-06-19 10:21:50 UTC

Size: 3.77 KB

patch

obsolete

>--- servers/slapd/aclparse.c	2005/01/20 17:01:05	1.110.2.12
>+++ servers/slapd/aclparse.c	2005/05/03 10:14:18	1.110.2.13
>@@ -281,49 +281,52 @@
> 						acl_usage();
> 					}
> 					ber_str2bv( right, 0, 1, &a->acl_attrval );
>-					if ( style && strcasecmp( style, "regex" ) == 0 ) {
>-						int e = regcomp( &a->acl_attrval_re, a->acl_attrval.bv_val,
>-							REG_EXTENDED | REG_ICASE | REG_NOSUB );
>-						if ( e ) {
>-							char buf[512];
>-							regerror( e, &a->acl_attrval_re, buf, sizeof(buf) );
>-							fprintf( stderr, "%s: line %d: "
>-								"regular expression \"%s\" bad because of %s\n",
>-								fname, lineno, right, buf );
>-							acl_usage();
>-						}
>-						a->acl_attrval_style = ACL_STYLE_REGEX;
>-					} else {
>-						/* FIXME: if the attribute has DN syntax,
>-						 * we might allow one, subtree and children styles as well */
>-						if ( !strcasecmp( style, "exact" ) ) {
>-							a->acl_attrval_style = ACL_STYLE_BASE;
>-
>-						} else if ( a->acl_attrs[0].an_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) {
>-							if ( !strcasecmp( style, "base" ) ) {
>+					a->acl_attrval_style = ACL_STYLE_BASE;
>+					if ( style ) {
>+						if ( strcasecmp( style, "regex" ) == 0 ) {
>+							int e = regcomp( &a->acl_attrval_re, a->acl_attrval.bv_val,
>+								REG_EXTENDED | REG_ICASE | REG_NOSUB );
>+							if ( e ) {
>+								char buf[512];
>+								regerror( e, &a->acl_attrval_re, buf, sizeof(buf) );
>+								fprintf( stderr, "%s: line %d: "
>+									"regular expression \"%s\" bad because of %s\n",
>+									fname, lineno, right, buf );
>+								acl_usage();
>+							}
>+							a->acl_attrval_style = ACL_STYLE_REGEX;
>+						} else {
>+							/* FIXME: if the attribute has DN syntax,
>+							 * we might allow one, subtree and children styles as well */
>+							if ( !strcasecmp( style, "exact" ) ) {
> 								a->acl_attrval_style = ACL_STYLE_BASE;
>-							} else if ( !strcasecmp( style, "onelevel" ) || !strcasecmp( style, "one" ) ) {
>-								a->acl_attrval_style = ACL_STYLE_ONE;
>-							} else if ( !strcasecmp( style, "subtree" ) || !strcasecmp( style, "sub" ) ) {
>-								a->acl_attrval_style = ACL_STYLE_SUBTREE;
>-							} else if ( !strcasecmp( style, "children" ) ) {
>-								a->acl_attrval_style = ACL_STYLE_CHILDREN;
>+	
>+							} else if ( a->acl_attrs[0].an_desc->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName ) {
>+								if ( !strcasecmp( style, "base" ) ) {
>+									a->acl_attrval_style = ACL_STYLE_BASE;
>+								} else if ( !strcasecmp( style, "onelevel" ) || !strcasecmp( style, "one" ) ) {
>+									a->acl_attrval_style = ACL_STYLE_ONE;
>+								} else if ( !strcasecmp( style, "subtree" ) || !strcasecmp( style, "sub" ) ) {
>+									a->acl_attrval_style = ACL_STYLE_SUBTREE;
>+								} else if ( !strcasecmp( style, "children" ) ) {
>+									a->acl_attrval_style = ACL_STYLE_CHILDREN;
>+								} else {
>+									fprintf( stderr, 
>+										"%s: line %d: unknown val.<style> \"%s\" "
>+										"for attributeType \"%s\" with DN syntax; using \"base\"\n",
>+										fname, lineno, style,
>+										a->acl_attrs[0].an_desc->ad_cname.bv_val );
>+									a->acl_attrval_style = ACL_STYLE_BASE;
>+								}
>+								
> 							} else {
> 								fprintf( stderr, 
> 									"%s: line %d: unknown val.<style> \"%s\" "
>-									"for attributeType \"%s\" with DN syntax; using \"base\"\n",
>+									"for attributeType \"%s\"; using \"exact\"\n",
> 									fname, lineno, style,
> 									a->acl_attrs[0].an_desc->ad_cname.bv_val );
> 								a->acl_attrval_style = ACL_STYLE_BASE;
> 							}
>-							
>-						} else {
>-							fprintf( stderr, 
>-								"%s: line %d: unknown val.<style> \"%s\" "
>-								"for attributeType \"%s\"; using \"exact\"\n",
>-								fname, lineno, style,
>-								a->acl_attrs[0].an_desc->ad_cname.bv_val );
>-							a->acl_attrval_style = ACL_STYLE_BASE;
> 						}
> 					}

Actions: View | Diff

Attachments on bug 244772: 157346 | 157357