@@ -25,6 +25,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
2525SFTP_SERVER =$(libexecdir ) /sftp-server
2626SSH_KEYSIGN =$(libexecdir ) /ssh-keysign
2727SSHD_SESSION =$(libexecdir ) /sshd-session
28+ SSHD_AUTH =$(libexecdir ) /sshd-auth
2829SSH_PKCS11_HELPER =$(libexecdir ) /ssh-pkcs11-helper
2930SSH_SK_HELPER =$(libexecdir ) /ssh-sk-helper
3031PRIVSEP_PATH =@PRIVSEP_PATH@
@@ -71,7 +72,7 @@ MKDIR_P=@MKDIR_P@
7172
7273.SUFFIXES : .lo
7374
74- TARGETS =ssh$(EXEEXT ) sshd$(EXEEXT ) sshd-session$(EXEEXT ) ssh-add$(EXEEXT ) ssh-keygen$(EXEEXT ) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT ) ssh-agent$(EXEEXT ) scp$(EXEEXT ) sftp-server$(EXEEXT ) sftp$(EXEEXT ) ssh-sk-helper$(EXEEXT )
75+ TARGETS =ssh$(EXEEXT ) sshd$(EXEEXT ) sshd-session$(EXEEXT ) sshd-auth $( EXEEXT ) ssh-add$(EXEEXT ) ssh-keygen$(EXEEXT ) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT ) ssh-agent$(EXEEXT ) scp$(EXEEXT ) sftp-server$(EXEEXT ) sftp$(EXEEXT ) ssh-sk-helper$(EXEEXT )
7576
7677XMSS_OBJS =\
7778 ssh-xmss.o \
@@ -137,9 +138,22 @@ SSHD_SESSION_OBJS=sshd-session.o auth-rhosts.o auth-passwd.o \
137138 auth2-gss.o gss-serv.o gss-serv-krb5.o \
138139 loginrec.o auth-pam.o auth-shadow.o auth-sia.o \
139140 sftp-server.o sftp-common.o \
140- sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
141- sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \
142- sandbox-solaris.o uidswap.o $(SKOBJS )
141+ uidswap.o $(SKOBJS )
142+
143+ SSHD_AUTH_OBJS =sshd-auth.o \
144+ auth2-methods.o \
145+ auth-rhosts.o auth-passwd.o sshpty.o sshlogin.o servconf.o \
146+ serverloop.o auth.o auth2.o auth-options.o session.o auth2-chall.o \
147+ groupaccess.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
148+ auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-pubkeyfile.o \
149+ auth2-gss.o gss-serv.o gss-serv-krb5.o \
150+ monitor_wrap.o auth-krb5.o \
151+ audit.o audit-bsm.o audit-linux.o platform.o \
152+ loginrec.o auth-pam.o auth-shadow.o auth-sia.o \
153+ sandbox-null.o sandbox-rlimit.o sandbox-darwin.o \
154+ sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-solaris.o \
155+ sftp-server.o sftp-common.o \
156+ uidswap.o $(SKOBJS )
143157
144158SFTP_CLIENT_OBJS =sftp-common.o sftp-client.o sftp-glob.o
145159
@@ -220,6 +234,9 @@ sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
220234sshd-session$(EXEEXT ) : libssh.a $(LIBCOMPAT ) $(SSHD_SESSION_OBJS )
221235 $(LD ) -o $@ $(SSHD_SESSION_OBJS ) $(LDFLAGS ) -lssh -lopenbsd-compat $(SSHDLIBS ) $(LIBS ) $(GSSLIBS ) $(K5LIBS ) $(CHANNELLIBS )
222236
237+ sshd-auth$(EXEEXT ) : libssh.a $(LIBCOMPAT ) $(SSHD_AUTH_OBJS )
238+ $(LD ) -o $@ $(SSHD_AUTH_OBJS ) $(LDFLAGS ) -lssh -lopenbsd-compat $(SSHDLIBS ) $(LIBS ) $(GSSLIBS ) $(K5LIBS ) $(CHANNELLIBS )
239+
223240scp$(EXEEXT ) : $(LIBCOMPAT ) libssh.a $(SCP_OBJS )
224241 $(LD ) -o $@ $(SCP_OBJS ) $(LDFLAGS ) -lssh -lopenbsd-compat $(LIBS )
225242
@@ -411,6 +428,7 @@ install-files:
411428 $(INSTALL ) -m 0755 $(STRIP_OPT ) ssh-keyscan$(EXEEXT ) $(DESTDIR )$(bindir ) /ssh-keyscan$(EXEEXT )
412429 $(INSTALL ) -m 0755 $(STRIP_OPT ) sshd$(EXEEXT ) $(DESTDIR )$(sbindir ) /sshd$(EXEEXT )
413430 $(INSTALL ) -m 0755 $(STRIP_OPT ) sshd-session$(EXEEXT ) $(DESTDIR )$(SSHD_SESSION )$(EXEEXT )
431+ $(INSTALL ) -m 0755 $(STRIP_OPT ) sshd-auth$(EXEEXT ) $(DESTDIR )$(SSHD_AUTH )$(EXEEXT )
414432 $(INSTALL ) -m 4711 $(STRIP_OPT ) ssh-keysign$(EXEEXT ) $(DESTDIR )$(SSH_KEYSIGN )$(EXEEXT )
415433 $(INSTALL ) -m 0755 $(STRIP_OPT ) ssh-pkcs11-helper$(EXEEXT ) $(DESTDIR )$(SSH_PKCS11_HELPER )$(EXEEXT )
416434 $(INSTALL ) -m 0755 $(STRIP_OPT ) ssh-sk-helper$(EXEEXT ) $(DESTDIR )$(SSH_SK_HELPER )$(EXEEXT )
@@ -754,6 +772,7 @@ interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TAR
754772 TEST_SSH_SSH=" $( BUILDDIR) " \
755773 TEST_SSH_SSHD=" $( BUILDDIR) " \
756774 TEST_SSH_SSHD_SESSION=" $( BUILDDIR) " \
775+ TEST_SSH_SSHD_AUTH=" $( BUILDDIR) " \
757776 TEST_SSH_SSHAGENT=" $( BUILDDIR) " \
758777 TEST_SSH_SSHADD=" $( BUILDDIR) " \
759778 TEST_SSH_SSHKEYGEN=" $( BUILDDIR) " \
0 commit comments