Fix GSS API pointer checking.

Kris Jurka

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index d3bb35f40ff1fba2f800879aecfc6bdc6cf4a19c..403a9664b46bc105370d6316ceeb4292bea499a7 100644 (file)
--- 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 a5d3bd0d474e3f82b9cc28f4d9bff6db0cf67e3d..ae9d47076a2d30e8171349fb710a67900fef2619 100644 (file)
--- 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 */