diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | entropy.c | 5 | ||||
-rw-r--r-- | pathnames.h | 4 |
4 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20010123 | ||
2 | - (bal) regexp.h typo in configure.in. Should have been regex.h | ||
3 | - (bal) SSH_USER_DIR to _PATH_SSH_USER_DIR patch by stevesk@ | ||
4 | |||
1 | 20010122 | 5 | 20010122 |
2 | - (bal) OpenBSD Resync | 6 | - (bal) OpenBSD Resync |
3 | - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus | 7 | - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus |
diff --git a/configure.in b/configure.in index 7007c9164..7cc58582b 100644 --- a/configure.in +++ b/configure.in | |||
@@ -312,7 +312,7 @@ AC_CHECK_FUNC(utimes, | |||
312 | ) | 312 | ) |
313 | 313 | ||
314 | # Checks for header files. | 314 | # Checks for header files. |
315 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regexp.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) | 315 | AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h) |
316 | 316 | ||
317 | dnl Checks for library functions. | 317 | dnl Checks for library functions. |
318 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) | 318 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv seteuid setlogin setproctitle setreuid setrlimit setsid sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) |
@@ -35,9 +35,10 @@ | |||
35 | #include "ssh.h" | 35 | #include "ssh.h" |
36 | #include "xmalloc.h" | 36 | #include "xmalloc.h" |
37 | #include "atomicio.h" | 37 | #include "atomicio.h" |
38 | #include "pathnames.h" | ||
38 | #include "log.h" | 39 | #include "log.h" |
39 | 40 | ||
40 | RCSID("$Id: entropy.c,v 1.24 2001/01/22 05:34:41 mouring Exp $"); | 41 | RCSID("$Id: entropy.c,v 1.25 2001/01/22 21:06:20 mouring Exp $"); |
41 | 42 | ||
42 | #ifndef offsetof | 43 | #ifndef offsetof |
43 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | 44 | # define offsetof(type, member) ((size_t) &((type *)0)->member) |
@@ -560,7 +561,7 @@ prng_write_seedfile(void) { | |||
560 | 561 | ||
561 | /* Try to ensure that the parent directory is there */ | 562 | /* Try to ensure that the parent directory is there */ |
562 | snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, | 563 | snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, |
563 | SSH_USER_DIR); | 564 | _PATH_SSH_USER_DIR); |
564 | mkdir(filename, 0700); | 565 | mkdir(filename, 0700); |
565 | 566 | ||
566 | snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, | 567 | snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, |
diff --git a/pathnames.h b/pathnames.h index 702251c08..a660d542d 100644 --- a/pathnames.h +++ b/pathnames.h | |||
@@ -103,7 +103,9 @@ | |||
103 | /* | 103 | /* |
104 | * Default location of askpass | 104 | * Default location of askpass |
105 | */ | 105 | */ |
106 | #ifndef _PATH_SSH_ASKPASS_DEFAULT | ||
106 | #define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" | 107 | #define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" |
108 | #endif | ||
107 | 109 | ||
108 | /* for scp */ | 110 | /* for scp */ |
109 | #ifndef _PATH_CP | 111 | #ifndef _PATH_CP |
@@ -128,7 +130,7 @@ | |||
128 | * Relevant only when using builtin PRNG. | 130 | * Relevant only when using builtin PRNG. |
129 | */ | 131 | */ |
130 | #ifndef SSH_PRNG_SEED_FILE | 132 | #ifndef SSH_PRNG_SEED_FILE |
131 | # define SSH_PRNG_SEED_FILE SSH_USER_DIR"/prng_seed" | 133 | # define SSH_PRNG_SEED_FILE _PATH_SSH_USER_DIR"/prng_seed" |
132 | #endif /* SSH_PRNG_SEED_FILE */ | 134 | #endif /* SSH_PRNG_SEED_FILE */ |
133 | #ifndef SSH_PRNG_COMMAND_FILE | 135 | #ifndef SSH_PRNG_COMMAND_FILE |
134 | # define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds" | 136 | # define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds" |