Import openssh_7.3p1.orig.tar.gz

1 files changed, 3 insertions, 40 deletions

diff --git a/regress/netcat.c b/regress/netcat.c
index 6234ba019..98a08b1ec 100644
--- a/regress/netcat.c
+++ b/regress/netcat.c
@@ -61,6 +61,9 @@
 #  include <sys/poll.h>
 # endif
 #endif
+#ifdef HAVE_ERR_H
+# include <err.h>
+#endif
 
 /* Telnet options from arpa/telnet.h */
 #define IAC     255
@@ -134,46 +137,6 @@ void	usage(int);
 ssize_t drainbuf(int, unsigned char *, size_t *);
 ssize_t fillbuf(int, unsigned char *, size_t *);
 
-static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));
-static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));
-static void warn(const char *, ...) __attribute__((format(printf, 1, 2)));
-
-static void
-err(int r, const char *fmt, ...)
-{
-        va_list args;
-
-        va_start(args, fmt);
-        fprintf(stderr, "%s: ", strerror(errno));
-        vfprintf(stderr, fmt, args);
-        fputc('\n', stderr);
-        va_end(args);
-        exit(r);
-}
-
-static void
-errx(int r, const char *fmt, ...)
-{
-        va_list args;
-
-        va_start(args, fmt);
-        vfprintf(stderr, fmt, args);
-        fputc('\n', stderr);
-        va_end(args);
-        exit(r);
-}
-
-static void
-warn(const char *fmt, ...)
-{
-        va_list args;
-
-        va_start(args, fmt);
-        fprintf(stderr, "%s: ", strerror(errno));
-        vfprintf(stderr, fmt, args);
-        fputc('\n', stderr);
-        va_end(args);
-}
 
 int
 main(int argc, char *argv[])