CVS commit: [netbsd-5] src/libexec/ftpd
Module Name:src Committed By: snj Date: Sat Nov 7 20:33:26 UTC 2015 Modified Files: src/libexec/ftpd [netbsd-5]: logwtmp.c Log Message: Pull up following revision(s) (requested by shm in ticket #1975): libexec/ftpd/logwtmp.c: revision 1.26 libexec/ftpd/logwtmp.c: revision 1.27 Removed unnecessary memset(3) call -- Clear utmpx struct before writing it to wtmpx files To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.24.1 src/libexec/ftpd/logwtmp.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/logwtmp.c diff -u src/libexec/ftpd/logwtmp.c:1.25 src/libexec/ftpd/logwtmp.c:1.25.24.1 --- src/libexec/ftpd/logwtmp.c:1.25 Sat Sep 23 16:03:50 2006 +++ src/libexec/ftpd/logwtmp.c Sat Nov 7 20:33:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: logwtmp.c,v 1.25 2006/09/23 16:03:50 xtraeme Exp $ */ +/* $NetBSD: logwtmp.c,v 1.25.24.1 2015/11/07 20:33:26 snj Exp $ */ /* * Copyright (c) 1988, 1993 @@ -36,7 +36,7 @@ #if 0 static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: logwtmp.c,v 1.25 2006/09/23 16:03:50 xtraeme Exp $"); +__RCSID("$NetBSD: logwtmp.c,v 1.25.24.1 2015/11/07 20:33:26 snj Exp $"); #endif #endif /* not lint */ @@ -124,13 +124,12 @@ ftpd_logwtmpx(const char *line, const ch if (fdx < 0) return; if (fstat(fdx, &buf) == 0) { + (void)memset(&ut, 0, sizeof(ut)); (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line)); (void)strncpy(ut.ut_name, name, sizeof(ut.ut_name)); (void)strncpy(ut.ut_host, host, sizeof(ut.ut_host)); if (haddr) (void)memcpy(&ut.ut_ss, &haddr->si_su, haddr->su_len); - else - (void)memset(&ut.ut_ss, 0, sizeof(ut.ut_ss)); ut.ut_type = utx_type; if (WIFEXITED(status)) ut.ut_exit.e_exit = (uint16_t)WEXITSTATUS(status);
CVS commit: [netbsd-5] src/libexec/ftpd
Module Name:src Committed By: snj Date: Mon Apr 12 02:28:16 UTC 2010 Modified Files: src/libexec/ftpd [netbsd-5]: popen.c Log Message: Pull up following revision(s) (requested by lukem in ticket #1372): libexec/ftpd/popen.c: revision 1.37 PR/43023: Bruce Cran: FTPD bug remote crash Since we specify NOCHECK, in the NOMATCH case gl_pathv can be NULL. (From FreeBSD) To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.34.4.1 src/libexec/ftpd/popen.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/popen.c diff -u src/libexec/ftpd/popen.c:1.34 src/libexec/ftpd/popen.c:1.34.4.1 --- src/libexec/ftpd/popen.c:1.34 Sat Sep 13 02:41:52 2008 +++ src/libexec/ftpd/popen.c Mon Apr 12 02:28:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: popen.c,v 1.34 2008/09/13 02:41:52 lukem Exp $ */ +/* $NetBSD: popen.c,v 1.34.4.1 2010/04/12 02:28:16 snj Exp $ */ /*- * Copyright (c) 1999-2008 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #else -__RCSID("$NetBSD: popen.c,v 1.34 2008/09/13 02:41:52 lukem Exp $"); +__RCSID("$NetBSD: popen.c,v 1.34.4.1 2010/04/12 02:28:16 snj Exp $"); #endif #endif /* not lint */ @@ -138,7 +138,8 @@ int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE|GLOB_LIMIT; memset(&gl, 0, sizeof(gl)); - if (glob(argv[argc], flags, NULL, &gl)) { + if (glob(argv[argc], flags, NULL, &gl) + || gl.gl_pathv == NULL) { if (sl_add(sl, ftpd_strdup(argv[argc])) == -1) { globfree(&gl); goto pfree;
CVS commit: [netbsd-5] src/libexec/ftpd
Module Name:src Committed By: snj Date: Mon Apr 12 02:30:12 UTC 2010 Modified Files: src/libexec/ftpd [netbsd-5]: version.h Log Message: Pull up following revision(s) (requested by lukem in ticket #1372): libexec/ftpd/version.h: revision 1.74 Update version to 20100320 for Christos' commit to popen.c 1.37 for: PR/43023: Bruce Cran: FTPD bug remote crash To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.70.4.1 src/libexec/ftpd/version.h 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/version.h diff -u src/libexec/ftpd/version.h:1.70 src/libexec/ftpd/version.h:1.70.4.1 --- src/libexec/ftpd/version.h:1.70 Tue Sep 16 12:30:38 2008 +++ src/libexec/ftpd/version.h Mon Apr 12 02:30:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.70 2008/09/16 12:30:38 lukem Exp $ */ +/* $NetBSD: version.h,v 1.70.4.1 2010/04/12 02:30:12 snj Exp $ */ /*- * Copyright (c) 1999-2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,5 +29,5 @@ */ #ifndef FTPD_VERSION -#define FTPD_VERSION "NetBSD-ftpd 20080916" +#define FTPD_VERSION "NetBSD-ftpd 20100320" #endif