diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2-gss.c | 3 | ||||
-rw-r--r-- | gss-genr.c | 4 | ||||
-rw-r--r-- | gss-serv.c | 4 |
4 files changed, 7 insertions, 9 deletions
@@ -17,6 +17,9 @@ | |||
17 | bz #1076 set SO_REUSEADDR on X11 forwarding listner sockets, preventing | 17 | bz #1076 set SO_REUSEADDR on X11 forwarding listner sockets, preventing |
18 | bind() failure when a previous connection's listeners are in TIME_WAIT, | 18 | bind() failure when a previous connection's listeners are in TIME_WAIT, |
19 | reported by plattner AT inf.ethz.ch; ok dtucker@ | 19 | reported by plattner AT inf.ethz.ch; ok dtucker@ |
20 | - stevesk@cvs.openbsd.org 2005/10/13 14:03:01 | ||
21 | [auth2-gss.c gss-genr.c gss-serv.c] | ||
22 | remove unneeded #includes; ok markus@ | ||
20 | 23 | ||
21 | 20051102 | 24 | 20051102 |
22 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). | 25 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). |
@@ -3150,4 +3153,4 @@ | |||
3150 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3153 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3151 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3154 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3152 | 3155 | ||
3153 | $Id: ChangeLog,v 1.3929 2005/11/05 03:53:39 djm Exp $ | 3156 | $Id: ChangeLog,v 1.3930 2005/11/05 04:03:24 djm Exp $ |
diff --git a/auth2-gss.c b/auth2-gss.c index 4d468a0e8..533649e7e 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.10 2005/07/17 07:17:54 djm Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.11 2005/10/13 14:03:01 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -34,7 +34,6 @@ | |||
34 | #include "log.h" | 34 | #include "log.h" |
35 | #include "dispatch.h" | 35 | #include "dispatch.h" |
36 | #include "servconf.h" | 36 | #include "servconf.h" |
37 | #include "compat.h" | ||
38 | #include "packet.h" | 37 | #include "packet.h" |
39 | #include "monitor_wrap.h" | 38 | #include "monitor_wrap.h" |
40 | 39 | ||
diff --git a/gss-genr.c b/gss-genr.c index 9bc31aa2a..2450a370c 100644 --- a/gss-genr.c +++ b/gss-genr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-genr.c,v 1.4 2005/07/17 07:17:55 djm Exp $ */ | 1 | /* $OpenBSD: gss-genr.c,v 1.5 2005/10/13 14:03:01 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -30,9 +30,7 @@ | |||
30 | 30 | ||
31 | #include "xmalloc.h" | 31 | #include "xmalloc.h" |
32 | #include "bufaux.h" | 32 | #include "bufaux.h" |
33 | #include "compat.h" | ||
34 | #include "log.h" | 33 | #include "log.h" |
35 | #include "monitor_wrap.h" | ||
36 | #include "ssh2.h" | 34 | #include "ssh2.h" |
37 | 35 | ||
38 | #include "ssh-gss.h" | 36 | #include "ssh-gss.h" |
diff --git a/gss-serv.c b/gss-serv.c index eeec286bd..2866f5974 100644 --- a/gss-serv.c +++ b/gss-serv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv.c,v 1.9 2005/09/19 11:48:10 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv.c,v 1.10 2005/10/13 14:03:01 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -29,13 +29,11 @@ | |||
29 | #ifdef GSSAPI | 29 | #ifdef GSSAPI |
30 | 30 | ||
31 | #include "bufaux.h" | 31 | #include "bufaux.h" |
32 | #include "compat.h" | ||
33 | #include "auth.h" | 32 | #include "auth.h" |
34 | #include "log.h" | 33 | #include "log.h" |
35 | #include "channels.h" | 34 | #include "channels.h" |
36 | #include "session.h" | 35 | #include "session.h" |
37 | #include "servconf.h" | 36 | #include "servconf.h" |
38 | #include "monitor_wrap.h" | ||
39 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
40 | #include "getput.h" | 38 | #include "getput.h" |
41 | 39 | ||