Fix nameuid ACL bug and remove related lint

diff --git a/CHANGES b/CHANGES
index 79167fdc53f90309d165e92cc4351a763c4a0b09..887e4d7a450839af2f839459ca1e0076f7d19bf9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.X Engineering
        Fixed slapd spasswd mutex bug
+       Fixed slapd ACL nameuid bug
        Updated -lldap SASL error reporting
        Updated -lldap TLS error reporting
        Build Environment

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index d3b88bc6ec6b3b0be789085e7ddb4b0dddb014c7..1784fbbcb42b689efb54d381345b650ad1ea4a31 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -508,7 +508,9 @@ parse_acl(
                                        }
 
                                        if( !is_at_syntax( b->a_group_at->ad_type,
-                                               SLAPD_DN_SYNTAX ) )
+                                               SLAPD_DN_SYNTAX ) &&
+                                           !is_at_syntax( b->a_group_at->ad_type,
+                                               SLAPD_NAMEUID_SYNTAX ) )
                                        {
                                                fprintf( stderr,
                                                        "%s: line %d: group \"%s\": inappropriate syntax: %s\n",

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 2999910f780d5a34c0752445817ef7a589232a68..a294ec919f42f55c1d873dddf7915b52f257bc1d 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -257,7 +257,7 @@ get_filter(
        case LDAP_FILTER_EXT:
                /* not yet implemented */
                Debug( LDAP_DEBUG_ANY, "extensible match not yet implemented.\n",
-                      f->f_choice, 0, 0 );
+                      0, 0, 0 );
                (void) ber_skip_tag( ber, &len );
                f->f_choice = SLAPD_FILTER_COMPUTED;
                f->f_result = SLAPD_COMPARE_UNDEFINED;

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 1f1257da97b3fc18cd6b001f8e90ac3e4036da90..7648fb6ac7cf0bde5893e11f3e16af8c5c91b946 100644 (file)
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -203,7 +203,7 @@ register_matching_rule(
        ldap_memfree( mr );
 
        if ( code ) {
-               Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s for %s in %s\n",
+               Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s for %s in %s\n",
                    scherr2str(code), err, desc );
                return( -1 );
        }

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 69007e65e907f3ddf31a18fa1c04323241f89937..c198a003b702b520fa554d2e266ee5b3e0fd5148 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -103,6 +103,7 @@ LDAP_BEGIN_DECL
 
 /* must match in schema_init.c */
 #define SLAPD_DN_SYNTAX                        "1.3.6.1.4.1.1466.115.121.1.12"
+#define SLAPD_NAMEUID_SYNTAX           "1.3.6.1.4.1.1466.115.121.1.34"
 #define SLAPD_GROUP_ATTR               "member"
 #define SLAPD_GROUP_CLASS              "groupOfNames"
 #define SLAPD_ROLE_ATTR                        "roleOccupant"
@@ -527,7 +528,7 @@ typedef struct slap_filter {
 #define f_mr_rule              f_un.f_un_mra->ma_rule
 #define f_mr_desc              f_un.f_un_mra->ma_desc
 #define f_mr_value             f_un.f_un_mra->ma_value
-#define        f_mr_dnaddrs    f_un.f_un_mra->ma_dnattrs
+#define        f_mr_dnattrs    f_un.f_un_mra->ma_dnattrs
 
                /* and, or, not */
                struct slap_filter *f_un_complex;