20010123
- (bal) regexp.h typo in configure.in. Should have been regex.h - (bal) SSH_USER_DIR to _PATH_SSH_USER_DIR patch by stevesk@
This commit is contained in:
parent
226cfa0378
commit
cb577331b4
|
@ -1,3 +1,7 @@
|
||||||
|
20010123
|
||||||
|
- (bal) regexp.h typo in configure.in. Should have been regex.h
|
||||||
|
- (bal) SSH_USER_DIR to _PATH_SSH_USER_DIR patch by stevesk@
|
||||||
|
|
||||||
20010122
|
20010122
|
||||||
- (bal) OpenBSD Resync
|
- (bal) OpenBSD Resync
|
||||||
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
|
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
|
||||||
|
|
|
@ -312,7 +312,7 @@ AC_CHECK_FUNC(utimes,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Checks for header files.
|
# Checks for header files.
|
||||||
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)
|
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)
|
||||||
|
|
||||||
dnl Checks for library functions.
|
dnl Checks for library functions.
|
||||||
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)
|
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 @@
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "atomicio.h"
|
#include "atomicio.h"
|
||||||
|
#include "pathnames.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
RCSID("$Id: entropy.c,v 1.24 2001/01/22 05:34:41 mouring Exp $");
|
RCSID("$Id: entropy.c,v 1.25 2001/01/22 21:06:20 mouring Exp $");
|
||||||
|
|
||||||
#ifndef offsetof
|
#ifndef offsetof
|
||||||
# define offsetof(type, member) ((size_t) &((type *)0)->member)
|
# define offsetof(type, member) ((size_t) &((type *)0)->member)
|
||||||
|
@ -560,7 +561,7 @@ prng_write_seedfile(void) {
|
||||||
|
|
||||||
/* Try to ensure that the parent directory is there */
|
/* Try to ensure that the parent directory is there */
|
||||||
snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
|
snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
|
||||||
SSH_USER_DIR);
|
_PATH_SSH_USER_DIR);
|
||||||
mkdir(filename, 0700);
|
mkdir(filename, 0700);
|
||||||
|
|
||||||
snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
|
snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
|
||||||
|
|
|
@ -103,7 +103,9 @@
|
||||||
/*
|
/*
|
||||||
* Default location of askpass
|
* Default location of askpass
|
||||||
*/
|
*/
|
||||||
|
#ifndef _PATH_SSH_ASKPASS_DEFAULT
|
||||||
#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass"
|
#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* for scp */
|
/* for scp */
|
||||||
#ifndef _PATH_CP
|
#ifndef _PATH_CP
|
||||||
|
@ -128,7 +130,7 @@
|
||||||
* Relevant only when using builtin PRNG.
|
* Relevant only when using builtin PRNG.
|
||||||
*/
|
*/
|
||||||
#ifndef SSH_PRNG_SEED_FILE
|
#ifndef SSH_PRNG_SEED_FILE
|
||||||
# define SSH_PRNG_SEED_FILE SSH_USER_DIR"/prng_seed"
|
# define SSH_PRNG_SEED_FILE _PATH_SSH_USER_DIR"/prng_seed"
|
||||||
#endif /* SSH_PRNG_SEED_FILE */
|
#endif /* SSH_PRNG_SEED_FILE */
|
||||||
#ifndef SSH_PRNG_COMMAND_FILE
|
#ifndef SSH_PRNG_COMMAND_FILE
|
||||||
# define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds"
|
# define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds"
|
||||||
|
|
Loading…
Reference in New Issue