diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-07-05 04:55:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-08 11:44:49 +1000 |
commit | 569b650f93b561c09c655f83f128e1dfffe74101 (patch) | |
tree | f40a1711f9f0cfa063a8acbb70870cdaf1b3d49f /Makefile.in | |
parent | b8e2b797362526437e0642a6c2f2970d794f2561 (diff) |
upstream: add a local implementation of BSD realpath() for
sftp-server use ahead of OpenBSD's realpath changing to match POSIX;
ok deraadt@ (thanks for snaps testing)
OpenBSD-Commit-ID: 4f8cbf7ed8679f6237264301d104ecec64885d55
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index b84ccaa1a..6abb60fd0 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -116,7 +116,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ | |||
116 | monitor.o monitor_wrap.o auth-krb5.o \ | 116 | monitor.o monitor_wrap.o auth-krb5.o \ |
117 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 117 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
118 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 118 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
119 | sftp-server.o sftp-common.o \ | 119 | sftp-server.o sftp-common.o sftp-realpath.o \ |
120 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ | 120 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ |
121 | sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ | 121 | sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ |
122 | sandbox-solaris.o uidswap.o | 122 | sandbox-solaris.o uidswap.o |
@@ -196,7 +196,7 @@ ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11 | |||
196 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o | 196 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o |
197 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 197 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
198 | 198 | ||
199 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o | 199 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-realpath.o sftp-server-main.o |
200 | $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 200 | $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
201 | 201 | ||
202 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | 202 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o |