summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--auth-options.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b7378443..0e0168aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
14 - markus@cvs.openbsd.org 2013/11/02 22:24:24 14 - markus@cvs.openbsd.org 2013/11/02 22:24:24
15 [kexdhs.c kexecdhs.c] 15 [kexdhs.c kexecdhs.c]
16 no need to include ssh-gss.h 16 no need to include ssh-gss.h
17 - markus@cvs.openbsd.org 2013/11/02 22:34:01
18 [auth-options.c]
19 no need to include monitor_wrap.h and ssh-gss.h
17 20
1820131103 2120131103
19 - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep. 22 - (dtucker) [openbsd-compat/bsd-misc.c] Include time.h for nanosleep.
diff --git a/auth-options.c b/auth-options.c
index 80d59ee95..b485f8d24 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.59 2013/07/12 00:19:58 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.60 2013/11/02 22:34:01 markus Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -33,10 +33,6 @@
33#include "auth-options.h" 33#include "auth-options.h"
34#include "hostfile.h" 34#include "hostfile.h"
35#include "auth.h" 35#include "auth.h"
36#ifdef GSSAPI
37#include "ssh-gss.h"
38#endif
39#include "monitor_wrap.h"
40 36
41/* Flags set authorized_keys flags */ 37/* Flags set authorized_keys flags */
42int no_port_forwarding_flag = 0; 38int no_port_forwarding_flag = 0;