CVS commit: othersrc/libexec/tnftpd/src

["Luke Mewburn" <lukem%netbsd.org@localhost>]

Module Name:    othersrc
Committed By:   lukem
Date:           Sat Sep 23 05:30:36 UTC 2023

Modified Files:
        othersrc/libexec/tnftpd/src: extern.h ftpcmd.y ftpd.c pfilter.c
            version.h

Log Message:
merge conflicts between NetBSD-20200615 and NetBSD-20230922


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 othersrc/libexec/tnftpd/src/extern.h \
    othersrc/libexec/tnftpd/src/ftpcmd.y
cvs rdiff -u -r1.38 -r1.39 othersrc/libexec/tnftpd/src/ftpd.c
cvs rdiff -u -r1.3 -r1.4 othersrc/libexec/tnftpd/src/pfilter.c
cvs rdiff -u -r1.10 -r1.11 othersrc/libexec/tnftpd/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.