From 94d458e8acc48621a58342f76757abadf019e1dd Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Fri, 18 Aug 2006 22:50:57 +0000
Subject: [PATCH]  - (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

---
 ChangeLog  | 6 ++++++
 gss-genr.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ccce575d..09fb453c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/gss-genr.c b/gss-genr.c
index 2ea2077c..e962942d 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -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);
-- 
2.45.2