diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gss-serv-krb5.c | 2 | ||||
-rw-r--r-- | gss-serv.c | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -12,6 +12,10 @@ | |||
12 | [ssh.1 ssh.c ssh_config.5 sshd_config.5] | 12 | [ssh.1 ssh.c ssh_config.5 sshd_config.5] |
13 | more details and clarity for tun(4) device forwarding; ok and help | 13 | more details and clarity for tun(4) device forwarding; ok and help |
14 | jmc@ | 14 | jmc@ |
15 | - stevesk@cvs.openbsd.org 2006/07/02 18:36:47 | ||
16 | [gss-serv-krb5.c gss-serv.c] | ||
17 | no "servconf.h" needed here | ||
18 | (gss-serv-krb5.c change not applied, portable needs the server options) | ||
15 | 19 | ||
16 | 20060706 | 20 | 20060706 |
17 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 21 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4745,4 +4749,4 @@ | |||
4745 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4749 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4746 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4750 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4747 | 4751 | ||
4748 | $Id: ChangeLog,v 1.4362 2006/07/10 10:16:27 djm Exp $ | 4752 | $Id: ChangeLog,v 1.4363 2006/07/10 10:17:55 djm Exp $ |
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 9b1792a62..eae29b2ae 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv-krb5.c,v 1.5 2006/03/25 22:22:43 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv-krb5.c,v 1.6 2006/07/02 18:36:47 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. |
diff --git a/gss-serv.c b/gss-serv.c index 5e43ffe58..4ce536d99 100644 --- a/gss-serv.c +++ b/gss-serv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv.c,v 1.17 2006/03/30 09:58:15 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv.c,v 1.18 2006/07/02 18:36:47 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. |
@@ -33,7 +33,6 @@ | |||
33 | #include "log.h" | 33 | #include "log.h" |
34 | #include "channels.h" | 34 | #include "channels.h" |
35 | #include "session.h" | 35 | #include "session.h" |
36 | #include "servconf.h" | ||
37 | #include "xmalloc.h" | 36 | #include "xmalloc.h" |
38 | #include "misc.h" | 37 | #include "misc.h" |
39 | 38 | ||