Fix ldapsearch fp uninitialized bug (from devel)

Ignore make clean rm error (from devel)

diff --git a/CHANGES b/CHANGES
index f7e1fc030773db3270bc04abbfa982aa32399f2b..77682733ca01bf89cf96646b240bac7d7d6662c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ OpenLDAP Change Log
 Changes included in OpenLDAP 1.2.12 Engineering
        CVS Tag: OPENLDAP_REL_ENG_1_2
        Fixed ldapmodify ldaphost NULL bug
+       Fixed ldapsearch uninitialized fp bug
+       Build Environment
+               Ignore make clean rm failure
 
 Changes included in OpenLDAP 1.2.11
        CVS Tag: OPENLDAP_REL_ENG_1_2_11

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 3ed10ad94bac2d34c052b69fd3014305ee08ecd8..35dd0701dcc82dbde1df56fbc32e9cfb14a6b765 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -101,7 +101,7 @@ int argc;
 char   **argv;
 {
     char               *infile, *filtpattern, **attrs, line[ BUFSIZ ];
-    FILE               *fp;
+    FILE               *fp = NULL;
     int                        rc, i, first, scope, kerberos, deref, attrsonly, debug;
     int                        ldap_options, timelimit, sizelimit, authmethod, want_bindpw;
     LDAP               *ld;

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fda33ec0b49384b5aef2a4225908131dafa5be1b..9fe9bbaf78df0434e8d525c70dde37eda93d9f19 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -10,7 +10,7 @@ all-local:    FORCE
        $(srcdir)/scripts/all $(srcdir)
 
 clean-local:   FORCE
-       $(RM) test-db/[!C]* test-repl/[!C]* *core
+       -$(RM) test-db/[!C]* test-repl/[!C]* *core
 
 veryclean-local: FORCE
        @-$(RM) data