Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / ftest.c

diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index a3f06eb49c760cdae989aed14cfb63d5d78a6710..b5f98db5ae508d645632f8bc078db5f2eb25f9f2 100644 (file)
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -1,9 +1,18 @@
+/* ftest.c -- OpenLDAP Filter API Test */
 /* $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-2013 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>.
  */
-/* OpenLDAP Filter API Test */
 
 #include "portable.h"
 
@@ -16,6 +25,7 @@
 #include <ldap.h>
 
 #include "ldap_pvt.h"
+#include "lber_pvt.h"
 
 #include "ldif.h"
 #include "lutil.h"
@@ -28,7 +38,7 @@ int usage()
 {
        fprintf( stderr, "usage:\n"
                "  ftest [-d n] filter\n"
-               "    filter - RFC 2254 string representation of an "
+               "    filter - RFC 4515 string representation of an "
                        "LDAP search filter\n" );
        return EXIT_FAILURE;
 }
@@ -76,7 +86,7 @@ main( int argc, char *argv[] )
 static int filter2ber( char *filter )
 {
        int rc;
-       struct berval bv = {0};
+       struct berval bv = BER_BVNULL;
        BerElement *ber;
 
        printf( "Filter: %s\n", filter );