Merge branch 'vendor/TNFTP'

diff --cc contrib/tnftp/cmds.c
index 3fc2b70,caa0960..dd8abc7
--- 1/contrib/tnftp/cmds.c
--- 2/contrib/tnftp/cmds.c
+++ b/contrib/tnftp/cmds.c
@@@ -115,8 -115,8 +115,9 @@@ __RCSID("$NetBSD: cmds.c,v 1.131 2010/0
  #include <limits.h>
  #include <netdb.h>
  #include <paths.h>
+ #include <stddef.h>
  #include <stdio.h>
 +#include <libutil.h>
  #include <stdlib.h>
  #include <string.h>
  #include <time.h>

diff --cc contrib/tnftp/fetch.c
Simple merge

diff --cc contrib/tnftp/ftp_var.h
Simple merge

diff --cc contrib/tnftp/util.c
Simple merge