- (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen

Petrov <roumen.petrov@skalasoft.com>
This commit is contained in:
Ben Lindstrom 2001-01-25 23:04:22 +00:00
parent 87b147f539
commit 27eebe6c1b
3 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,7 @@
20010126
- (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
Petrov <roumen.petrov@skalasoft.com>
20010125 20010125
- (djm) Sync bsd-* support files: - (djm) Sync bsd-* support files:
- deraadt@cvs.openbsd.org 2000/01/26 03:43:20 - deraadt@cvs.openbsd.org 2000/01/26 03:43:20

View File

@ -17,7 +17,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
CC=@CC@ CC=@CC@
LD=@LD@ LD=@LD@
PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@ CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@
LIBS=@LIBS@ LIBS=@LIBS@

View File

@ -35,7 +35,9 @@
#define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" #define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key"
#define _PATH_DH_PRIMES ETCDIR "/primes" #define _PATH_DH_PRIMES ETCDIR "/primes"
#ifndef _PATH_SSH_PROGRAM
#define _PATH_SSH_PROGRAM "/usr/bin/ssh" #define _PATH_SSH_PROGRAM "/usr/bin/ssh"
#endif
/* /*
* The process id of the daemon listening for connections is saved here to * The process id of the daemon listening for connections is saved here to