Ver código fonte

Ticket 47569 - ACIs do not allow attribute subtypes in targetattr keyword

When validating the targetattr ACI keyword, we check if the attribute
is defined in the schema.  This schema check fails if the attribute
has a subtype present.

This patch makes the attribute syntax lookup function check if a
subtype was specified before performing the looking.  If a subtype
is specified, it is stripped off and we just use the base attribute
name to lookup the syntax from the hashtable.
Nathan Kinder 12 anos atrás
pai
commit
cb73cf2b09
1 arquivos alterados com 19 adições e 1 exclusões
  1. 19 1
      ldap/servers/slapd/attrsyntax.c

+ 19 - 1
ldap/servers/slapd/attrsyntax.c

@@ -537,10 +537,28 @@ int
 attr_syntax_exists(const char *attr_name)
 {
 	struct asyntaxinfo	*asi;
+	char *check_attr_name = NULL;
+	char *p = NULL;
+	int free_attr = 0;
+
+	/* Ignore any attribute subtypes. */
+	if (p = strchr(attr_name, ';')) {
+		int check_attr_len = p - attr_name + 1;
+
+		check_attr_name = (char *)slapi_ch_malloc(check_attr_len);
+		PR_snprintf(check_attr_name, check_attr_len, "%s", attr_name);
+		free_attr = 1;
+ 	} else {
+		check_attr_name = attr_name;
+	}
 
-	asi = attr_syntax_get_by_name(attr_name);
+	asi = attr_syntax_get_by_name(check_attr_name);
 	attr_syntax_return( asi );
 
+	if (free_attr) {
+		slapi_ch_free_string(&check_attr_name);
+	}
+
 	if ( asi != NULL )
 	{
 		return 1;