From 57faeb69b75db07809313c4bf4c2b97294da6866 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 02 Feb 2009 22:56:13 +0000
Subject: [PATCH] Fix a typo in IPv4 wild card pattern matching which prevented address masks of the form "*.*.*.*" from ever matching an IPv4 address.
---
opends/src/server/org/opends/server/types/AddressMask.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/types/AddressMask.java b/opends/src/server/org/opends/server/types/AddressMask.java
index 7533bff..ed96f04 100644
--- a/opends/src/server/org/opends/server/types/AddressMask.java
+++ b/opends/src/server/org/opends/server/types/AddressMask.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.types;
import org.opends.messages.Message;
@@ -403,6 +403,7 @@
*
* @return A string representation of this address mask.
*/
+ @Override
public String toString()
{
return ruleString;
@@ -492,12 +493,12 @@
*/
private boolean matchAddress(byte[] remoteMask)
{
+ if(ruleType == RuleType.ALLWILDCARD)
+ return true;
if(prefixMask== null)
return false;
if(remoteMask.length != prefixMask.length)
return false;
- if(ruleType == RuleType.ALLWILDCARD)
- return true;
for(int i=0;i < prefixMask.length; i++)
{
if(!wildCard.get(i))
--
Gitblit v1.10.0