summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gss-serv-krb5.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 711c4c289..b414f3cb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 - djm@cvs.openbsd.org 2004/07/21 10:33:31 7 - djm@cvs.openbsd.org 2004/07/21 10:33:31
8 [auth1.c auth2.c] 8 [auth1.c auth2.c]
9 bz#899: Don't display invalid usernames in setproctitle 9 bz#899: Don't display invalid usernames in setproctitle
10 from peak AT argo.troja.mff.cuni.cz; ok markus@
11 - djm@cvs.openbsd.org 2004/07/21 10:36:23
12 [gss-serv-krb5.c]
13 fix function declaration
10 14
1120040720 1520040720
12 - (djm) [log.c] bz #111: Escape more control characters when sending data 16 - (djm) [log.c] bz #111: Escape more control characters when sending data
@@ -1553,4 +1557,4 @@
1553 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1557 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1554 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1558 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1555 1559
1556$Id: ChangeLog,v 1.3485 2004/07/21 10:48:53 djm Exp $ 1560$Id: ChangeLog,v 1.3486 2004/07/21 10:49:39 djm Exp $
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 4e3598ead..6bd5830fb 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-serv-krb5.c,v 1.2 2003/11/21 11:57:03 djm Exp $ */ 1/* $OpenBSD: gss-serv-krb5.c,v 1.3 2004/07/21 10:36:23 djm 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.
@@ -53,7 +53,7 @@ static krb5_context krb_context = NULL;
53/* Initialise the krb5 library, for the stuff that GSSAPI won't do */ 53/* Initialise the krb5 library, for the stuff that GSSAPI won't do */
54 54
55static int 55static int
56ssh_gssapi_krb5_init() 56ssh_gssapi_krb5_init(void)
57{ 57{
58 krb5_error_code problem; 58 krb5_error_code problem;
59 59