[src/trunk]: src/libexec/ftpd Reduce priority of syslog message if getpeernam...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b7c9fe878f68
branches:  trunk
changeset: 769259:b7c9fe878f68
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Sep 04 23:16:41 2011 +0000

description:
Reduce priority of syslog message if getpeername returns ENOTCONN.
PR bin/18934 by Greg A. Woods (with supplied fix).

diffstat:

 libexec/ftpd/ftpd.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e07a36323b10 -r b7c9fe878f68 libexec/ftpd/ftpd.c
--- a/libexec/ftpd/ftpd.c       Sun Sep 04 23:03:00 2011 +0000
+++ b/libexec/ftpd/ftpd.c       Sun Sep 04 23:16:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpd.c,v 1.195 2011/08/29 20:41:06 joerg Exp $ */
+/*     $NetBSD: ftpd.c,v 1.196 2011/09/04 23:16:41 lukem Exp $ */
 
 /*
  * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpd.c     8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ftpd.c,v 1.195 2011/08/29 20:41:06 joerg Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.196 2011/09/04 23:16:41 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -601,7 +601,8 @@
        memset((char *)&his_addr, 0, sizeof(his_addr));
        addrlen = sizeof(his_addr.si_su);
        if (getpeername(0, (struct sockaddr *)&his_addr.si_su, &addrlen) < 0) {
-               syslog(LOG_ERR, "getpeername (%s): %m",argv[0]);
+               syslog((errno == ENOTCONN) ? LOG_NOTICE : LOG_ERR,
+                   "getpeername (%s): %m",argv[0]);
                exit(1);
        }
        his_addr.su_len = addrlen;