From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 8 Jan 2002 17:26:47 +0000 (+0000)
Subject: Import ITS#1515 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_0_20~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bd6fd9cc825ac17a360942e01958a1ae25b3db6;p=thirdparty%2Fopenldap.git

Import ITS#1515 fix from HEAD
	ACL sockname/peername exact match logic error
---

diff --git a/CHANGES b/CHANGES
index d7ecda2a4f..830a403a48 100644
--- 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 314ae74e4a..43cdfbd1d9 100644
--- 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;
 				}
 			}