From 4089dd2111cbe5b39d8d9823cbcdbe7cc4310e4a Mon Sep 17 00:00:00 2001 From: Murray Date: Sun, 9 Jun 2002 22:19:37 +0000 Subject: [PATCH] Merge from branch: Don't print errors in fallback_discard(). --- common/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/socket.c b/common/socket.c index 0a8be2d2..9e1c89da 100644 --- a/common/socket.c +++ b/common/socket.c @@ -51,7 +51,7 @@ #ifndef lint static char copyright[] = -"$Id: socket.c,v 1.56 2002/06/09 22:17:09 murray Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: socket.c,v 1.57 2002/06/09 22:19:37 murray Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -312,10 +312,13 @@ isc_result_t fallback_discard (object) status = recvfrom (interface -> wfdesc, buf, sizeof buf, 0, (struct sockaddr *)&from, &flen); +#if defined (DEBUG) + /* Only report fallback discard errors if we're debugging. */ if (status < 0) { log_error ("fallback_discard: %m"); return ISC_R_UNEXPECTED; } +#endif return ISC_R_SUCCESS; } #endif /* USE_SOCKET_FALLBACK */