X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapcat.c;h=a0f1d3c9977502ee137c090b79845584c815bba9;hb=6d1aa51604a7ae9c44287af5201afc9f43b5e91e;hp=b8da193d30f96cf205d8ab27a4f7a0d935c51900;hpb=282fccbb3e4694276ed714ba7e02dded8486c664;p=openldap

diff --git a/servers/slapd/slapcat.c b/servers/slapd/slapcat.c
index b8da193d30..a0f1d3c997 100644
--- a/servers/slapd/slapcat.c
+++ b/servers/slapd/slapcat.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -84,7 +84,6 @@ slapcat( int argc, char **argv )
 		char *data;
 		int len;
 		Entry* e;
-		int writerc;
 
 		if ( gotsig )
 			break;
@@ -124,16 +123,8 @@ slapcat( int argc, char **argv )
 			break;
 		}
 
-		writerc = fputs( data, ldiffp->fp );
-		if ( writerc == EOF ) {
-			fprintf(stderr, "%s: error writing output.\n",
-				progname);
-			rc = EXIT_FAILURE;
-			break;
-		}
-
-		writerc = fputs( "\n", ldiffp->fp );
-		if ( writerc == EOF ) {
+		if ( fputs( data, ldiffp->fp ) == EOF ||
+			fputs( "\n", ldiffp->fp ) == EOF ) {
 			fprintf(stderr, "%s: error writing output.\n",
 				progname);
 			rc = EXIT_FAILURE;
@@ -143,6 +134,7 @@ slapcat( int argc, char **argv )
 
 	be->be_entry_close( be );
 
-	slap_tool_destroy();
+	if ( slap_tool_destroy())
+		rc = EXIT_FAILURE;
 	return rc;
 }