Module Name: othersrc
Committed By: lukem
Date: Sun Oct 1 01:48:50 UTC 2023
Modified Files:
othersrc/libexec/tnftpd/src: conf.c ftpd.c version.h
Log Message:
merge conflicts between NetBSD-20230922 and NetBSD-20230930
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 othersrc/libexec/tnftpd/src/conf.c \
othersrc/libexec/tnftpd/src/version.h
cvs rdiff -u -r1.39 -r1.40 othersrc/libexec/tnftpd/src/ftpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
