tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) A few type mismatch fixes from Bug #565

This commit is contained in:
Damien Miller 2003-05-16 15:51:44 +10:00
parent e3e71247c3
commit c46b6bc4f7
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15,6 +15,7 @@
add a ConnectTimeout option to ssh, based on patch from add a ConnectTimeout option to ssh, based on patch from
Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@ Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
- (djm) Add warning for UsePAM when built without PAM support - (djm) Add warning for UsePAM when built without PAM support
- (djm) A few type mismatch fixes from Bug #565
20030515 20030515
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -1546,4 +1547,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2728 2003/05/16 01:42:35 djm Exp $ $Id: ChangeLog,v 1.2729 2003/05/16 05:51:44 djm Exp $

6
entropy.c
View File

@ -45,7 +45,7 @@
* XXX: we should tell the child how many bytes we need. * XXX: we should tell the child how many bytes we need.
*/ */
RCSID("$Id: entropy.c,v 1.44 2002/06/09 19:41:48 mouring Exp $"); RCSID("$Id: entropy.c,v 1.45 2003/05/16 05:51:45 djm Exp $");
#ifndef OPENSSL_PRNG_ONLY #ifndef OPENSSL_PRNG_ONLY
#define RANDOM_SEED_SIZE 48 #define RANDOM_SEED_SIZE 48
@ -89,8 +89,8 @@ seed_rng(void)
if (original_uid != original_euid && if (original_uid != original_euid &&
( seteuid(getuid()) == -1 || ( seteuid(getuid()) == -1 ||
setuid(original_uid) == -1) ) { setuid(original_uid) == -1) ) {
fprintf(stderr, "(rand child) setuid(%d): %s\n", fprintf(stderr, "(rand child) setuid(%li): %s\n",
original_uid, strerror(errno)); (long int)original_uid, strerror(errno));
_exit(1); _exit(1);
} }

8
ssh-rand-helper.c
View File

@ -39,7 +39,7 @@
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: ssh-rand-helper.c,v 1.10 2003/03/17 05:13:53 djm Exp $"); RCSID("$Id: ssh-rand-helper.c,v 1.11 2003/05/16 05:51:45 djm Exp $");
/* Number of bytes we write out */ /* Number of bytes we write out */
#define OUTPUT_SEED_SIZE 48 #define OUTPUT_SEED_SIZE 48
@ -532,7 +532,7 @@ prng_check_seedfile(char *filename)
/* mode 0600, owned by root or the current user? */ /* mode 0600, owned by root or the current user? */
if (((st.st_mode & 0177) != 0) || !(st.st_uid == getuid())) { if (((st.st_mode & 0177) != 0) || !(st.st_uid == getuid())) {
debug("WARNING: PRNG seedfile %.100s must be mode 0600, " debug("WARNING: PRNG seedfile %.100s must be mode 0600, "
"owned by uid %d", filename, getuid()); "owned by uid %li", filename, (long int)getuid());
return 0; return 0;
} }
@ -550,7 +550,7 @@ prng_write_seedfile(void)
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if (pw == NULL) if (pw == NULL)
fatal("Couldn't get password entry for current user " fatal("Couldn't get password entry for current user "
"(%i): %s", getuid(), strerror(errno)); "(%li): %s", (long int)getuid(), strerror(errno));
/* 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,
@ -589,7 +589,7 @@ prng_read_seedfile(void)
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if (pw == NULL) if (pw == NULL)
fatal("Couldn't get password entry for current user " fatal("Couldn't get password entry for current user "
"(%i): %s", getuid(), strerror(errno)); "(%li): %s", (long int)getuid(), strerror(errno));
snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir, snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
SSH_PRNG_SEED_FILE); SSH_PRNG_SEED_FILE);