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 2a49badd1ffea6194c928303741c0a68d14ebcb9..b5f98db5ae508d645632f8bc078db5f2eb25f9f2 100644 (file)
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,7 @@
 #include <ldap.h>
 
 #include "ldap_pvt.h"
+#include "lber_pvt.h"
 
 #include "ldif.h"
 #include "lutil.h"
@@ -37,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;
 }
@@ -85,7 +86,7 @@ main( int argc, char *argv[] )
 static int filter2ber( char *filter )
 {
        int rc;
-       struct berval bv = {0, NULL};
+       struct berval bv = BER_BVNULL;
        BerElement *ber;
 
        printf( "Filter: %s\n", filter );