From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 16 Jul 2015 17:43:14 +0000 (-0400)
Subject: Conditionalize iprop stderr output in kadmind
X-Git-Tag: krb5-1.14-alpha1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06fbc91195bc3f7e21a9e391e98b8090aaa9b24b;p=thirdparty%2Fkrb5.git

Conditionalize iprop stderr output in kadmind

kadmind should be quiet in nofork mode after it prints the
"starting..." sentinel line, or it can fill the pipe buffer when run
from k5test.py.  Since there is currently no run-time debuf flag,
conditionalize the DPRINT macro in ipropd_svc.c on DEBUG at compile
time.

ticket: 8219 (new)
---

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index bc760fa5f8..209c19a9e9 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -51,6 +51,7 @@ static char *reply_unknown_str	= "<UNKNOWN_CODE>";
 #ifdef	DPRINT
 #undef	DPRINT
 #endif
+#ifdef DEBUG
 #define	DPRINT(...)				\
     do {					\
 	if (nofork) {				\
@@ -58,7 +59,9 @@ static char *reply_unknown_str	= "<UNKNOWN_CODE>";
 	    fflush(stderr);			\
 	}					\
     } while (0)
-
+#else
+#define	DPRINT(...)
+#endif
 
 static void
 debprret(char *w, update_status_t ret, kdb_sno_t sno)