diff options
author | Damien Miller <djm@mindrot.org> | 2006-08-19 08:50:57 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-08-19 08:50:57 +1000 |
commit | deccaa7d0f8e8c8cd8f1f9ebb7d02fe2f456a760 (patch) | |
tree | edf949803932bb1aa4bd9033335aca2022ccba89 | |
parent | bb59814cd644f78e82df07d820ed00fa7a25e68a (diff) |
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2006/08/18 22:41:29
[gss-genr.c]
GSSAPI error code should be 0 and not -1; from simon@sxw.org.uk
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | gss-genr.c | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +20060819 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2006/08/18 22:41:29 + [gss-genr.c] + GSSAPI error code should be 0 and not -1; from simon@sxw.org.uk + 20060818 - (dtucker) [configure.ac openbsd-compat/bsd-closefrom.c] Resync with closefrom.c from sudo. @@ -5266,4 +5272,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.4496 2006/08/18 22:38:23 djm Exp $ +$Id: ChangeLog,v 1.4497 2006/08/18 22:50:57 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: gss-genr.c,v 1.15 2006/08/18 14:40:34 djm Exp $ */ +/* $OpenBSD: gss-genr.c,v 1.16 2006/08/18 22:41:29 djm Exp $ */ /* * Copyright (c) 2001-2006 Simon Wilkinson. All rights reserved. @@ -301,7 +301,7 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) /* RFC 4462 says we MUST NOT do SPNEGO */ if (oid->length == spnego_oid.length && (memcmp(oid->elements, spnego_oid.elements, oid->length) == 0)) - return -1; + return 0; /* false */ ssh_gssapi_build_ctx(ctx); ssh_gssapi_set_oid(*ctx, oid); |