X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fstr2filter.c;h=ba00cf0cabe8954836025974033d9bd1b01c60e4;hb=babc993ef7c95ac05c4f75370da1c9effaa4df37;hp=c4f41060d9cbe2ef5f8c5a61ff0faf164108b81c;hpb=f897519d11b039518f5a9985be6b0f4ba5edbbea;p=openldap

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index c4f41060d9..ba00cf0cab 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,8 +1,27 @@
-/* str2filter.c - parse an rfc 1588 string filter */
+/* str2filter.c - parse an RFC 2554 string filter */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* 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>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -28,8 +47,8 @@ str2filter_x( Operation *op, const char *str )
 {
 	int rc;
 	Filter	*f = NULL;
-	char berbuf[LBER_ELEMENT_SIZEOF];
-	BerElement *ber = (BerElement *)berbuf;
+	BerElementBuffer berbuf;
+	BerElement *ber = (BerElement *)&berbuf;
 	const char *text = NULL;
 
 #ifdef NEW_LOGGING
@@ -44,7 +63,7 @@ str2filter_x( Operation *op, const char *str )
 
 	ber_init2( ber, NULL, LBER_USE_DER );
 	if ( op->o_tmpmemctx ) {
-		ber_set_option( ber, LBER_OPT_BER_MEMCTX, op->o_tmpmemctx );
+		ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
 	}
 
 	rc = ldap_pvt_put_filter( ber, str );