=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 03:53:26 UTC 2025
On branch cf/5396
nothing to commit, working tree clean
=== applying patch ./postgres.patch
Applied patch to 'src/interfaces/libpq/fe-connect.c' with conflicts.
Applied patch to 'src/interfaces/libpq/libpq-int.h' with conflicts.
U src/interfaces/libpq/fe-connect.c
U src/interfaces/libpq/libpq-int.h
diff --cc src/interfaces/libpq/fe-connect.c
index e1cea790f9,865eb74fd7..0000000000
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@@ -367,11 -365,10 +367,18 @@@ static const internalPQconninfoOption P
  		"Load-Balance-Hosts", "", 8,	/* sizeof("disable") = 8 */
  	offsetof(struct pg_conn, load_balance_hosts)},
  
++<<<<<<< ours
 +	{"scram_client_key", NULL, NULL, NULL, "SCRAM-Client-Key", "D", SCRAM_MAX_KEY_LEN * 2,
 +	offsetof(struct pg_conn, scram_client_key)},
 +
 +	{"scram_server_key", NULL, NULL, NULL, "SCRAM-Server-Key", "D", SCRAM_MAX_KEY_LEN * 2,
 +	offsetof(struct pg_conn, scram_server_key)},
++=======
+ 	{"check_all_addrs", "PGCHECKALLADDRS",
+ 		DefaultLoadBalanceHosts, NULL,
+ 		"Check-All-Addrs", "", 1,
+ 	offsetof(struct pg_conn, check_all_addrs)},
++>>>>>>> theirs
  
  	/* Terminating entry --- MUST BE LAST */
  	{NULL, NULL, NULL, NULL,
@@@ -4911,8 -4708,7 +4918,12 @@@ freePGconn(PGconn *conn
  	free(conn->rowBuf);
  	free(conn->target_session_attrs);
  	free(conn->load_balance_hosts);
++<<<<<<< ours
 +	free(conn->scram_client_key);
 +	free(conn->scram_server_key);
++=======
+ 	free(conn->check_all_addrs);
++>>>>>>> theirs
  	termPQExpBuffer(&conn->errorMessage);
  	termPQExpBuffer(&conn->workBuffer);
  
diff --cc src/interfaces/libpq/libpq-int.h
index e0d5b5fe0b,c51ec28234..0000000000
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@@ -430,8 -427,7 +430,12 @@@ struct pg_con
  	char	   *target_session_attrs;	/* desired session properties */
  	char	   *require_auth;	/* name of the expected auth method */
  	char	   *load_balance_hosts; /* load balance over hosts */
++<<<<<<< ours
 +	char	   *scram_client_key;	/* base64-encoded SCRAM client key */
 +	char	   *scram_server_key;	/* base64-encoded SCRAM server key */
++=======
+ 	char       *check_all_addrs;  /* whether to check all ips within a host or terminate on failure */
++>>>>>>> theirs
  
  	bool		cancelRequest;	/* true if this connection is used to send a
  								 * cancel request, instead of being a normal