Import ITS#1515 fix from HEAD

	ACL sockname/peername exact match logic error

diff --git a/CHANGES b/CHANGES
index d7ecda2a4f373be5d91191e82ab8644940ce3aa4..830a403a482b18332d5349c67d769d886f37d907 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.20 Engineering
+       Fixed slapd ACL peername/sockname exact match bug (ITS#1516)
        Fixed -lldap cache debug bug (ITS#1501)
        Updated BerkeleyDB 4 support
 

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 314ae74e4a619d2edf57a494722f20f86882d08d..43cdfbd1d996b93dd93d86382b54d6f70d18f570 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -495,7 +495,7 @@ acl_mask(
                                                continue;
                                        }
                                } else {
-                                       if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) == 0 )
+                                       if ( strcasecmp( b->a_sockurl_pat, conn->c_listener_url ) != 0 )
                                                continue;
                                }
                        }
@@ -513,7 +513,7 @@ acl_mask(
                                                continue;
                                        }
                                } else {
-                                       if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) == 0 )
+                                       if ( strcasecmp( b->a_domain_pat, conn->c_peer_domain ) != 0 )
                                                continue;
                                }
                        }
@@ -531,7 +531,7 @@ acl_mask(
                                                continue;
                                        }
                                } else {
-                                       if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) == 0 )
+                                       if ( strcasecmp( b->a_peername_pat, conn->c_peer_name ) != 0 )
                                                continue;
                                }
                        }
@@ -549,7 +549,7 @@ acl_mask(
                                                continue;
                                        }
                                } else {
-                                       if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) == 0 )
+                                       if ( strcasecmp( b->a_sockname_pat, conn->c_sock_name ) != 0 )
                                                continue;
                                }
                        }