Fix GSS API pointer checking.

bmomjian · bmomjian · commit 7f9de5407a20 · 2007-09-14T15:58:02.000Z
Kris Jurka
diff --git 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
@@ -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 */
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.155 2007/07/24 09:00:27 mha Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.156 2007/09/14 15:58:02 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -493,7 +493,7 @@ pg_GSS_recvauth(Port *port)`
`493`	`493`	`/*`
`494`	`494`	`* Release service principal credentials`
`495`	`495`	`*/`
`496`		`- gss_release_cred(&min_stat, port->gss->cred);`
	`496`	`+ gss_release_cred(&min_stat, &port->gss->cred);`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`/*`