krb5 commit: Conditionalize iprop stderr output in kadmind

Greg Hudson ghudson at mit.edu
Thu Jul 16 23:17:03 EDT 2015


https://github.com/krb5/krb5/commit/06fbc91195bc3f7e21a9e391e98b8090aaa9b24b
commit 06fbc91195bc3f7e21a9e391e98b8090aaa9b24b
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Jul 16 13:43:14 2015 -0400

    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)

 src/kadmin/server/ipropd_svc.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index bc760fa..209c19a 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)


More information about the cvs-krb5 mailing list