tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2006/08/18 14:40:34 

[gss-genr.c ssh-gss.h]
     constify host argument to match the rest of the GSSAPI functions and
     unbreak compilation with -Werror
This commit is contained in:
Damien Miller 2006-08-19 00:46:43 +10:00
parent a1cb9f334b
commit 3d2d6e90e4
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -38,6 +38,10 @@
[gss-genr.c ssh-gss.h sshconnect2.c] [gss-genr.c ssh-gss.h sshconnect2.c]
bz #1218 - disable SPNEGO as per RFC4462; diff from simon AT sxw.org.uk bz #1218 - disable SPNEGO as per RFC4462; diff from simon AT sxw.org.uk
ok markus@ ok markus@
- djm@cvs.openbsd.org 2006/08/18 14:40:34
[gss-genr.c ssh-gss.h]
constify host argument to match the rest of the GSSAPI functions and
unbreak compilation with -Werror
20060817 20060817
- (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c] - (dtucker) [openbsd-compat/fake-rfc2553.c openbsd-compat/setproctitle.c]
@ -5259,4 +5263,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4494 2006/08/18 14:33:34 djm Exp $ $Id: ChangeLog,v 1.4495 2006/08/18 14:46:43 djm Exp $

4
gss-genr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-genr.c,v 1.14 2006/08/18 13:54:54 djm Exp $ */ /* $OpenBSD: gss-genr.c,v 1.15 2006/08/18 14:40:34 djm Exp $ */
/* /*
* Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved.
@ -292,7 +292,7 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
} }
int int
ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, char *host) ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
{ {
gss_buffer_desc token = GSS_C_EMPTY_BUFFER; gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
OM_uint32 major, minor; OM_uint32 major, minor;

4
ssh-gss.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-gss.h,v 1.8 2006/08/18 13:54:54 djm Exp $ */ /* $OpenBSD: ssh-gss.h,v 1.9 2006/08/18 14:40:34 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
* *
@ -118,7 +118,7 @@ void ssh_gssapi_delete_ctx(Gssctxt **);
OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, char *); int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
/* In the server */ /* In the server */
int ssh_gssapi_userok(char *name); int ssh_gssapi_userok(char *name);