From 10a445b9e509086dc4c97e39d5a3d1342c2228fd Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 21 Jul 2004 20:49:39 +1000 Subject: - djm@cvs.openbsd.org 2004/07/21 10:36:23 [gss-serv-krb5.c] fix function declaration --- ChangeLog | 6 +++++- gss-serv-krb5.c | 4 ++-- 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 @@ - djm@cvs.openbsd.org 2004/07/21 10:33:31 [auth1.c auth2.c] bz#899: Don't display invalid usernames in setproctitle + from peak AT argo.troja.mff.cuni.cz; ok markus@ + - djm@cvs.openbsd.org 2004/07/21 10:36:23 + [gss-serv-krb5.c] + fix function declaration 20040720 - (djm) [log.c] bz #111: Escape more control characters when sending data @@ -1553,4 +1557,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3485 2004/07/21 10:48:53 djm Exp $ +$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 @@ -/* $OpenBSD: gss-serv-krb5.c,v 1.2 2003/11/21 11:57:03 djm Exp $ */ +/* $OpenBSD: gss-serv-krb5.c,v 1.3 2004/07/21 10:36:23 djm Exp $ */ /* * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. @@ -53,7 +53,7 @@ static krb5_context krb_context = NULL; /* Initialise the krb5 library, for the stuff that GSSAPI won't do */ static int -ssh_gssapi_krb5_init() +ssh_gssapi_krb5_init(void) { krb5_error_code problem; -- cgit v1.2.3