X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Flimits.c;h=f460ecb8d7a8abc09ba1bfce9ff48c7dd545aef4;hb=0a5f1e8516d386784ed7f605e5d03c7ee6d7cedd;hp=6c74b449b752847282fc28326fbb7adb53bd8265;hpb=8473f6e77821a56c588839dde6ebd4cad887f92a;p=openldap

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 6c74b449b7..f460ecb8d7 100644
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -1,7 +1,17 @@
 /* limits.c - routines to handle regex-based size and time limits */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -174,7 +184,7 @@ add_limits(
 			bv.bv_val = (char *) pattern;
 			bv.bv_len = strlen( pattern );
 
-			rc = dnNormalize2( NULL, &bv, &lm->lm_dn_pat );
+			rc = dnNormalize( 0, NULL, NULL, &bv, &lm->lm_dn_pat, NULL );
 			if ( rc != LDAP_SUCCESS ) {
 				ch_free( lm );
 				return( -1 );
@@ -563,7 +573,6 @@ parse_limit(
 					}
 				}
 
-#ifdef LDAP_CONTROL_PAGEDRESULTS
 			} else if ( strncasecmp( arg, "pr", sizeof( "pr" ) - 1 ) == 0 ) {
 				arg += sizeof( "pr" ) - 1;
 				if ( arg[0] != '=' ) {
@@ -581,7 +590,6 @@ parse_limit(
 						return( 1 );
 					}
 				}
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
 				
 			} else {
 				return( 1 );