RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller 

<markm@swoon.net>
This commit is contained in:
Damien Miller 2001-02-27 09:47:16 +11:00
parent 5a7613186b
commit 248131ae99
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -12,6 +12,8 @@
- (djm) Search for -lcrypt on FreeBSD too - (djm) Search for -lcrypt on FreeBSD too
- (djm) fatal() on OpenSSL version mismatch - (djm) fatal() on OpenSSL version mismatch
- (djm) Move PAM init to after fork for non-Solaris derived PAMs - (djm) Move PAM init to after fork for non-Solaris derived PAMs
- (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller
<markm@swoon.net>
20010226 20010226
- (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again. - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.
@ -4146,4 +4148,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.831 2001/02/26 22:28:23 djm Exp $ $Id: ChangeLog,v 1.832 2001/02/26 22:47:16 djm Exp $

10
entropy.c
View File

@ -40,7 +40,7 @@
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: entropy.c,v 1.32 2001/02/26 22:20:58 djm Exp $"); RCSID("$Id: entropy.c,v 1.33 2001/02/26 22:47:16 djm Exp $");
#ifndef offsetof #ifndef offsetof
# define offsetof(type, member) ((size_t) &((type *)0)->member) # define offsetof(type, member) ((size_t) &((type *)0)->member)
@ -850,8 +850,8 @@ void init_rng(void)
* Propagate the privileged uid to all of our uids. * Propagate the privileged uid to all of our uids.
* Set the effective uid to the given (unprivileged) uid. * Set the effective uid to the given (unprivileged) uid.
*/ */
if (original_uid != original_euid && setuid(original_euid) == -1 || if (original_uid != original_euid && (setuid(original_euid) == -1 ||
seteuid(original_uid) == -1) seteuid(original_uid) == -1))
fatal("Couldn't give up privileges"); fatal("Couldn't give up privileges");
#endif /* SAVED_IDS_WORK_WITH_SETEUID */ #endif /* SAVED_IDS_WORK_WITH_SETEUID */
@ -866,8 +866,8 @@ void init_rng(void)
* Propagate the real uid (usually more privileged) to effective uid * Propagate the real uid (usually more privileged) to effective uid
* as well. * as well.
*/ */
if (original_uid != original_euid && seteuid(original_euid) == -1 || if (original_uid != original_euid && (seteuid(original_euid) == -1 ||
setuid(original_uid) == -1) setuid(original_uid) == -1))
fatal("Couldn't restore privileges"); fatal("Couldn't restore privileges");
#endif /* SAVED_IDS_WORK_WITH_SETEUID */ #endif /* SAVED_IDS_WORK_WITH_SETEUID */