From 7f9de5407a2014b717fdaef363e8dfede499217d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 14 Sep 2007 15:58:02 +0000
Subject: [PATCH] Fix GSS API pointer checking.

Kris Jurka
---
 src/backend/libpq/auth.c   |  4 ++--
 src/backend/libpq/pqcomm.c | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index d3bb35f40f..403a9664b4 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.155 2007/07/24 09:00:27 mha Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.156 2007/09/14 15:58:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -493,7 +493,7 @@ pg_GSS_recvauth(Port *port)
 		/*
 		 * Release service principal credentials
 		 */
-		gss_release_cred(&min_stat, port->gss->cred);
+		gss_release_cred(&min_stat, &port->gss->cred);
 	}
 
 	/*
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index a5d3bd0d47..ae9d47076a 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -30,7 +30,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.195 2007/07/24 11:16:36 mha Exp $
+ *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.196 2007/09/14 15:58:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -178,11 +178,11 @@ pq_close(int code, Datum arg)
 		OM_uint32	min_s;
 
 		/* Shutdown GSSAPI layer */
-		if (MyProcPort->gss->ctx)
-			gss_delete_sec_context(&min_s, MyProcPort->gss->ctx, NULL);
+		if (MyProcPort->gss->ctx != GSS_C_NO_CONTEXT)
+			gss_delete_sec_context(&min_s, &MyProcPort->gss->ctx, NULL);
 
-		if (MyProcPort->gss->cred)
-			gss_release_cred(&min_s, MyProcPort->gss->cred);
+		if (MyProcPort->gss->cred != GSS_C_NO_CREDENTIAL)
+			gss_release_cred(&min_s, &MyProcPort->gss->cred);
 #endif /* ENABLE_GSS */
 		/* GSS and SSPI share the port->gss struct */
 
-- 
2.11.0