[Bug 299157] pam_ssh.c no longer builds in 15-STABLE after OpenSSH update?

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

            Bug ID: 299157
           Summary: pam_ssh.c no longer builds in 15-STABLE after OpenSSH
                    update?
           Product: Base System
           Version: 15.1-STABLE
          Hardware: amd64
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: bin
          Assignee: bugs@FreeBSD.org
          Reporter: mvoorhis@mcvau.net

After the recent openssh update I can no longer run a buildworld; I run into an
error compiling src/lib/libpam/modules/pam_ssh/pam_ssh.c.  Looks like a macro
"ssh_add_identity_constrained" in the recently-edited "ssh_namespace.h" ..?


Error in my buildworld output is as follows:

[...]
--- pam_ssh.o ---
/FreeBSD/src-releng_15-git/src/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)
      |                            
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/FreeBSD/src-releng_15-git/src/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)
      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                   
      ^
/FreeBSD/src-releng_15-git/src/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);
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/FreeBSD/src-releng_15-git/src/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.o] Error code 1

make[7]: stopped making "all" in
/FreeBSD/src-releng_15-git/src/lib/libpam/modules/pam_ssh

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