=== Applying patches on top of PostgreSQL commit ID 2cff363715efe3fd2dfbb04f9aa52fd5638f8f0d === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Apr 9 04:21:27 UTC 2026 On branch cf/6474 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Doc-Mark-RADIUS-deprecated.patch === Applying: Doc: Mark RADIUS deprecated. Using index info to reconstruct a base tree... M doc/src/sgml/client-auth.sgml Falling back to patching base and 3-way merge... Auto-merging doc/src/sgml/client-auth.sgml CONFLICT (content): Merge conflict in doc/src/sgml/client-auth.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Doc: Mark RADIUS deprecated. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./0001-Doc-Mark-RADIUS-deprecated.patch === patching file doc/src/sgml/client-auth.sgml Hunk #1 succeeded at 1765 with fuzz 2 (offset -345 lines). [cf/6474 d5372705f41] Doc: Mark RADIUS deprecated. Author: Thomas Munro Date: Fri Jan 23 14:23:53 2026 +1300 1 file changed, 9 insertions(+) === using 'git am' to apply patch ./0002-Drop-RADIUS-support.patch === Applying: Drop RADIUS support. Using index info to reconstruct a base tree... M doc/src/sgml/client-auth.sgml M src/backend/libpq/auth.c M src/backend/libpq/hba.c M src/backend/libpq/pg_hba.conf.sample M src/backend/utils/adt/hbafuncs.c M src/include/libpq/hba.h M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list CONFLICT (content): Merge conflict in src/tools/pgindent/typedefs.list Auto-merging src/include/libpq/hba.h Auto-merging src/backend/utils/adt/hbafuncs.c Auto-merging src/backend/libpq/pg_hba.conf.sample Auto-merging src/backend/libpq/hba.c CONFLICT (content): Merge conflict in src/backend/libpq/hba.c Auto-merging src/backend/libpq/auth.c Auto-merging doc/src/sgml/client-auth.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Drop RADIUS support. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./0002-Drop-RADIUS-support.patch === patching file doc/src/sgml/client-auth.sgml Hunk #1 FAILED at 616. Hunk #2 FAILED at 1127. Hunk #3 FAILED at 2096. 3 out of 3 hunks FAILED -- saving rejects to file doc/src/sgml/client-auth.sgml.rej patching file src/backend/libpq/auth.c Hunk #1 FAILED at 202. Hunk #2 FAILED at 295. Hunk #3 FAILED at 616. Hunk #4 FAILED at 757. Hunk #5 FAILED at 2772. 5 out of 5 hunks FAILED -- saving rejects to file src/backend/libpq/auth.c.rej patching file src/backend/libpq/hba.c Hunk #1 FAILED at 114. Hunk #2 FAILED at 1744. Hunk #3 FAILED at 1947. Hunk #4 FAILED at 2350. 4 out of 4 hunks FAILED -- saving rejects to file src/backend/libpq/hba.c.rej patching file src/backend/libpq/pg_hba.conf.sample Hunk #1 FAILED at 53. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/libpq/pg_hba.conf.sample.rej patching file src/backend/utils/adt/hbafuncs.c Hunk #1 FAILED at 134. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/hbafuncs.c.rej patching file src/include/libpq/hba.h Hunk #1 FAILED at 37. Hunk #2 FAILED at 128. 2 out of 2 hunks FAILED -- saving rejects to file src/include/libpq/hba.h.rej patching file src/tools/pgindent/typedefs.list Hunk #1 FAILED at 4053. 1 out of 1 hunk FAILED -- saving rejects to file src/tools/pgindent/typedefs.list.rej Removing doc/src/sgml/client-auth.sgml.rej Removing src/backend/libpq/auth.c.rej Removing src/backend/libpq/hba.c.rej Removing src/backend/libpq/pg_hba.conf.sample.rej Removing src/backend/utils/adt/hbafuncs.c.rej Removing src/include/libpq/hba.h.rej Removing src/tools/pgindent/typedefs.list.rej === using 'git apply' to apply patch ./0002-Drop-RADIUS-support.patch === Applied patch to 'doc/src/sgml/client-auth.sgml' cleanly. Applied patch to 'src/backend/libpq/auth.c' cleanly. Applied patch to 'src/backend/libpq/hba.c' with conflicts. Applied patch to 'src/backend/libpq/pg_hba.conf.sample' cleanly. Applied patch to 'src/backend/utils/adt/hbafuncs.c' cleanly. Applied patch to 'src/include/libpq/hba.h' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' with conflicts. U src/backend/libpq/hba.c U src/tools/pgindent/typedefs.list diff --cc src/backend/libpq/hba.c index d47eab2cba0,0afc9cddcea..00000000000 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@@ -2280,32 -2280,6 +2280,35 @@@ parse_hba_auth_opt(char *name, char *va { REQUIRE_AUTH_OPTION(uaOAuth, "validator", "oauth"); hbaline->oauth_validator = pstrdup(val); ++<<<<<<< ours + } + else if (strncmp(name, "validator.", strlen("validator.")) == 0) + { + const char *key = name + strlen("validator."); + + REQUIRE_AUTH_OPTION(uaOAuth, name, "oauth"); + + /* + * Validator modules may register their own per-HBA-line options. + * Unfortunately, since we don't want to require these modules to be + * loaded into the postmaster, we don't know if the options are valid + * yet and must store them for later. Perform only a basic syntax + * check here. + */ + if (!valid_oauth_hba_option_name(key)) + { + ereport(elevel, + (errcode(ERRCODE_CONFIG_FILE_ERROR), + errmsg("invalid OAuth validator option name: \"%s\"", name), + errcontext("line %d of configuration file \"%s\"", + line_num, file_name))); + return false; + } + + hbaline->oauth_opt_keys = lappend(hbaline->oauth_opt_keys, pstrdup(key)); + hbaline->oauth_opt_vals = lappend(hbaline->oauth_opt_vals, pstrdup(val)); ++======= ++>>>>>>> theirs } else if (strcmp(name, "delegate_ident_mapping") == 0) { diff --cc src/tools/pgindent/typedefs.list index ea95e7984bc,4bc8a8d6fad..00000000000 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@@ -4185,7 -4053,6 +4185,10 @@@ qc_hash_fun qsort_arg_comparator qsort_comparator query_pathkeys_callback ++<<<<<<< ours +RadixSortInfo ++======= ++>>>>>>> theirs rangeTableEntry_used_context rank_context rbt_allocfunc