diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gss-serv-krb5.c | 2 | ||||
-rw-r--r-- | gss-serv.c | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -23,6 +23,10 @@ | |||
23 | - stevesk@cvs.openbsd.org 2005/10/13 14:20:37 | 23 | - stevesk@cvs.openbsd.org 2005/10/13 14:20:37 |
24 | [gss-serv.c] | 24 | [gss-serv.c] |
25 | spelling in comments | 25 | spelling in comments |
26 | - stevesk@cvs.openbsd.org 2005/10/13 19:08:08 | ||
27 | [gss-serv-krb5.c gss-serv.c] | ||
28 | unused declarations; ok deraadt@ | ||
29 | (id sync only for gss-serv-krb5.c) | ||
26 | 30 | ||
27 | 20051102 | 31 | 20051102 |
28 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). | 32 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). |
@@ -3156,4 +3160,4 @@ | |||
3156 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3160 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3157 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3161 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3158 | 3162 | ||
3159 | $Id: ChangeLog,v 1.3931 2005/11/05 04:03:48 djm Exp $ | 3163 | $Id: ChangeLog,v 1.3932 2005/11/05 04:05:28 djm Exp $ |
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 4f02621dd..5c5837ffb 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv-krb5.c,v 1.3 2004/07/21 10:36:23 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv-krb5.c,v 1.4 2005/10/13 19:08:08 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 3cc6cdd37..56ff9f612 100644 --- a/gss-serv.c +++ b/gss-serv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv.c,v 1.11 2005/10/13 14:20:37 stevesk Exp $ */ | 1 | /* $OpenBSD: gss-serv.c,v 1.12 2005/10/13 19:08:08 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. |
@@ -39,8 +39,6 @@ | |||
39 | 39 | ||
40 | #include "ssh-gss.h" | 40 | #include "ssh-gss.h" |
41 | 41 | ||
42 | extern ServerOptions options; | ||
43 | |||
44 | static ssh_gssapi_client gssapi_client = | 42 | static ssh_gssapi_client gssapi_client = |
45 | { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, | 43 | { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, |
46 | GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; | 44 | GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}}; |