From 49a0b0f7e835f221068baebc5fe6ca3800a10cf4 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 10 Jun 2000 18:52:08 +0000
Subject: [PATCH] Fix ldapsearch fp uninitialized bug (from devel) Ignore make
 clean rm error (from devel)

---
 CHANGES                    | 3 +++
 clients/tools/ldapsearch.c | 2 +-
 tests/Makefile.in          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index f7e1fc0307..77682733ca 100644
--- 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 3ed10ad94b..35dd0701dc 100644
--- 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 fda33ec0b4..9fe9bbaf78 100644
--- 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
-- 
2.39.5