Module Name: src
Committed By: martin
Date: Mon Oct 2 17:09:42 UTC 2023
Modified Files:
src/libexec/ftpd [netbsd-9]: extern.h ftpd.c
Log Message:
Pull up following revision(s) (requested by lukem in ticket #1737):
libexec/ftpd/extern.h: revision 1.65
libexec/ftpd/ftpd.c: revision 1.205
bump sizes
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.4.1 src/libexec/ftpd/extern.h
cvs rdiff -u -r1.204 -r1.204.4.1 src/libexec/ftpd/ftpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/extern.h
diff -u src/libexec/ftpd/extern.h:1.64 src/libexec/ftpd/extern.h:1.64.4.1
--- src/libexec/ftpd/extern.h:1.64 Sat Jun 23 07:21:00 2018
+++ src/libexec/ftpd/extern.h Mon Oct 2 17:09:41 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.64 2018/06/23 07:21:00 gson Exp $ */
+/* $NetBSD: extern.h,v 1.64.4.1 2023/10/02 17:09:41 martin Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -330,7 +330,7 @@ GLOBAL char proctitle[BUFSIZ]; /* initi
GLOBAL struct passwd *pw;
GLOBAL int quietmessages;
GLOBAL char remotehost[MAXHOSTNAMELEN+1];
-GLOBAL char remoteloghost[2 * MAXHOSTNAMELEN+1];
+GLOBAL char remoteloghost[2 * MAXHOSTNAMELEN + 4];
GLOBAL off_t restart_point;
GLOBAL char tmpline[FTP_BUFLEN];
GLOBAL int type;
Index: src/libexec/ftpd/ftpd.c
diff -u src/libexec/ftpd/ftpd.c:1.204 src/libexec/ftpd/ftpd.c:1.204.4.1
--- src/libexec/ftpd/ftpd.c:1.204 Sat Apr 28 13:38:00 2018
+++ src/libexec/ftpd/ftpd.c Mon Oct 2 17:09:41 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.204 2018/04/28 13:38:00 riastradh Exp $ */
+/* $NetBSD: ftpd.c,v 1.204.4.1 2023/10/02 17:09:41 martin Exp $ */
/*
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 19
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ftpd.c,v 1.204 2018/04/28 13:38:00 riastradh Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.204.4.1 2023/10/02 17:09:41 martin Exp $");
#endif
#endif /* not lint */
@@ -2863,7 +2863,7 @@ logremotehost(struct sockinet *who)
{
#if defined(HAVE_SOCKADDR_SNPRINTF)
- char abuf[BUFSIZ];
+ char abuf[MAXHOSTNAMELEN];
#endif
struct sockaddr *sa = (struct sockaddr *)&who->si_su;