summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-10-02 00:42:30 +0000
committerDamien Miller <djm@mindrot.org>2019-10-02 10:43:47 +1000
commitd0c3ac427f6c52b872d6617421421dd791664445 (patch)
tree4f2236f676e01ea17cea889e13798c3078e4182d
parent084682786d9275552ee93857cb36e43c446ce92c (diff)
upstream: remove some duplicate #includes
-rw-r--r--auth-rhosts.c3
-rw-r--r--auth.c3
-rw-r--r--sftp-glob.c3
-rw-r--r--sftp.c3
-rw-r--r--ssh-keysign.c3
5 files changed, 5 insertions, 10 deletions
diff --git a/auth-rhosts.c b/auth-rhosts.c
index 63c1c8ac..7a10210b 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rhosts.c,v 1.50 2019/06/28 13:35:04 deraadt Exp $ */
+/* $OpenBSD: auth-rhosts.c,v 1.51 2019/10/02 00:42:30 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,7 +38,6 @@
#include "sshkey.h"
#include "servconf.h"
#include "canohost.h"
-#include "sshkey.h"
#include "hostfile.h"
#include "auth.h"
diff --git a/auth.c b/auth.c
index 61fb1feb..ca450f4e 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.140 2019/09/06 04:53:27 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.141 2019/10/02 00:42:30 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -73,7 +73,6 @@
#endif
#include "authfile.h"
#include "monitor_wrap.h"
-#include "authfile.h"
#include "ssherr.h"
#include "compat.h"
#include "channels.h"
diff --git a/sftp-glob.c b/sftp-glob.c
index 43a1beba..c196c51e 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.c,v 1.27 2015/01/14 13:54:13 djm Exp $ */
+/* $OpenBSD: sftp-glob.c,v 1.28 2019/10/02 00:42:30 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -25,7 +25,6 @@
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
-#include <stdlib.h>
#include "xmalloc.h"
#include "sftp.h"
diff --git a/sftp.c b/sftp.c
index fa833d25..b66037f1 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.194 2019/07/10 07:04:27 tb Exp $ */
+/* $OpenBSD: sftp.c,v 1.195 2019/10/02 00:42:30 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -53,7 +53,6 @@ typedef void EditLine;
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <stdarg.h>
#ifdef HAVE_UTIL_H
# include <util.h>
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 2ff86756..3ede407d 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.60 2019/09/06 05:23:55 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.61 2019/10/02 00:42:30 djm Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -58,7 +58,6 @@
#include "pathnames.h"
#include "readconf.h"
#include "uidswap.h"
-#include "sshkey.h"
#include "ssherr.h"
extern char *__progname;