[Bug 299156] 15.1-STABLE source build after this morning's "git pull --ff-only" fails

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=299156

            Bug ID: 299156
           Summary: 15.1-STABLE source build after this morning's "git
                    pull --ff-only" fails
           Product: Base System
           Version: 15.1-STABLE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: bin
          Assignee: bugs@FreeBSD.org
          Reporter: karl@denninger.net

I was pretty-current already, running:
FreeBSD 15.1-STABLE stable/15-n285727-b69c0082426d GENERIC


The git log shows openssh updates with the most recent being 
commit f2b0910a9831d09404558611d20364456549a96f
Author: Ed Maste <emaste@FreeBSD.org>
Date:   Thu Jul 9 17:17:11 2026 +0000

    OpenSSH: Update to 10.4p1

An attempted build (with "make clean" first) after this pull crashes here; it
looks like there is a parameter count change that did not flow through
everywhere it needed to:



--- all_subdir_lib/libpam ---
--- .depend ---
echo pam_tacplus.so.6:
/usr/obj/usr/src.15-STABLE/amd64.amd64/tmp/usr/lib/libtacplus.a
/usr/obj/usr/src.15-STABLE/amd64.amd64/tmp/usr/lib/libpam.a >> .depend
--- pam_tacplus.o ---
cc -target x86_64-unknown-freebsd15.1
--sysroot=/usr/obj/usr/src.15-STABLE/amd64.amd64/tmp
-B/usr/obj/usr/src.15-STABLE/amd64.amd64/tmp/usr/bin -DOPENPAM_STATIC_MODULES
-O2 -pipe -fno-common   -I/usr/src.15-STABLE/contrib/openpam/include
-I/usr/src.15-STABLE/lib/libpam -DOPENPAM_DEBUG
-ffile-prefix-map=/usr/src.15-STABLE=/usr/src
-ffile-prefix-map=/usr/obj/usr/src.15-STABLE=/usr/obj -MD 
-MF.depend.pam_tacplus.o -MTpam_tacplus.o -std=gnu17 -Wno-format-zero-length
-fstack-protector-strong  -Wsystem-headers -Werror -Wall -Wno-format-y2k -W
-Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter
-Wcast-align -Wchar-subscripts -Wnested-externs -Wold-style-definition
-Wno-pointer-sign -Wdate-time -Wmissing-variable-declarations -Wthread-safety
-Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable
-Wno-error=unused-but-set-parameter -Wno-error=cast-function-type-mismatch 
-Qunused-arguments     -c
/usr/src.15-STABLE/lib/libpam/modules/pam_tacplus/pam_tacplus.c -o
pam_tacplus.o
--- all_subdir_lib/libpam/modules/pam_ssh ---
/usr/src.15-STABLE/lib/libpam/modules/pam_ssh/pam_ssh.c:350:8: error: too many
arguments to function call, expected 8, have 9
  350 |                         if (ssh_add_identity(fd, psk->key,
psk->comment) == 0)
      |                            
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src.15-STABLE/lib/libpam/modules/pam_ssh/pam_ssh.c:65:72: note: expanded
from macro 'ssh_add_identity'
   65 |         ssh_add_identity_constrained(auth, key, comment, 0, 0, 0, NULL,
NULL, 0)
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                   
      ^
/usr/src.15-STABLE/crypto/openssh/authfd.h:50:5: note:
'Fssh_ssh_add_identity_constrained' declared here
   50 | int     ssh_add_identity_constrained(int sock, struct sshkey *key,
      |         ^                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   51 |     const char *comment, u_int life, u_int confirm, const char
*provider,
      |    
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   52 |     struct dest_constraint **dest_constraints, size_t
ndest_constraints);
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/src.15-STABLE/crypto/openssh/ssh_namespace.h:600:39: note: expanded from
macro 'ssh_add_identity_constrained'
  600 | #define ssh_add_identity_constrained           
Fssh_ssh_add_identity_constrained
      |                                                 ^
1 error generated.
*** [pam_ssh.pico] Error code 1


It may be that some of the source changes associated with this just haven't all
been propagated yet -- or there may be a missing commit to libpam.....

-- 
You are receiving this mail because:
You are the assignee for the bug.