You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by re...@apache.org on 2025/12/06 07:47:10 UTC

(cloudberry) branch cbdb-postgres-merge updated: Fix ./configure --with-gssapi. (#1475)

This is an automated email from the ASF dual-hosted git repository.

reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git


The following commit(s) were added to refs/heads/cbdb-postgres-merge by this push:
     new cd90a9d714e Fix ./configure --with-gssapi. (#1475)
cd90a9d714e is described below

commit cd90a9d714e4bfd8a70345b4b79e137b3e78cc8b
Author: reshke <re...@double.cloud>
AuthorDate: Sat Dec 6 12:47:06 2025 +0500

    Fix ./configure --with-gssapi. (#1475)
    
    $subj
    repeated #endif /* ENABLE_GSS */ was oversight of 4e49012
---
 src/backend/libpq/be-gssapi-common.c | 6 ++++--
 src/include/libpq/be-gssapi-common.h | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/libpq/be-gssapi-common.c b/src/backend/libpq/be-gssapi-common.c
index d8861dbe5f9..830c23538c2 100644
--- a/src/backend/libpq/be-gssapi-common.c
+++ b/src/backend/libpq/be-gssapi-common.c
@@ -133,14 +133,16 @@ pg_store_delegated_credential(gss_cred_id_t cred)
 
 	if (major != GSS_S_COMPLETE)
 	{
-		pg_GSS_error("gss_store_cred", major, minor);
+		/* Cloudberry is different from upstream here, see 536fd6b */
+		pg_GSS_error_be("gss_store_cred", major, minor);
 	}
 
 	/* Credential stored, so we can release our credential handle. */
 	major = gss_release_cred(&minor, &cred);
 	if (major != GSS_S_COMPLETE)
 	{
-		pg_GSS_error("gss_release_cred", major, minor);
+		/* Cloudberry is different from upstream here, see 536fd6b */
+		pg_GSS_error_be("gss_release_cred", major, minor);
 	}
 
 	/*
diff --git a/src/include/libpq/be-gssapi-common.h b/src/include/libpq/be-gssapi-common.h
index cb4719f35da..6a838446c6b 100644
--- a/src/include/libpq/be-gssapi-common.h
+++ b/src/include/libpq/be-gssapi-common.h
@@ -28,8 +28,6 @@
 extern void pg_GSS_error_be(const char *errmsg,
 							OM_uint32 maj_stat, OM_uint32 min_stat);
 
-#endif							/* ENABLE_GSS */
-
 extern void pg_store_delegated_credential(gss_cred_id_t cred);
 #endif							/* ENABLE_GSS */
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org