X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ffilter.c;h=2a999def09f2452321dd743849d2e95ead7473f8;hb=42bc6ed9914361861b4df4d0bddf9233a2f7fe65;hp=7b7bd88704ec8dc2d7ea292b839fb0a1dd911979;hpb=fd1bf397702d416f9121a6afa3082ff19c82346e;p=openldap

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index 7b7bd88704..2a999def09 100644
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,6 @@ static int ldap_is_oid ( const char *str )
 				dot=0;
 
 			} else if ( str[i] == '.' ) {
-				if( dot ) return 0;
 				if( ++dot > 1 ) return 0;
 
 			} else {
@@ -120,7 +119,6 @@ static int ldap_is_desc ( const char *str )
 				dot=0;
 
 			} else if ( str[i] == '.' ) {
-				if( dot ) return 0;
 				if( ++dot > 1 ) return 0;
 
 			} else {
@@ -938,7 +936,7 @@ ldap_put_vrFilter( BerElement *ber, const char *str_in )
 	int rc =0;
 	
 	if ( ber_printf( ber, "{" /*"}"*/ ) == -1 ) {
-		rc = -1;
+		return -1;
 	}
 	
 	rc = put_vrFilter( ber, str_in );