diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-08-29 16:32:59 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-08-29 16:32:59 +1000 |
| commit | 34620d6f710f97bddc6f7730cee5c6404c4153ba (patch) | |
| tree | ed317ac1e6b5f38656ae98d6c799a9ebd3c5bfa0 /ssh-keysign.c | |
| parent | 27a8f6b05636648367ea373d77d129327eb515a9 (diff) | |
| download | openssh-git-34620d6f710f97bddc6f7730cee5c6404c4153ba.tar.gz | |
- dtucker@cvs.openbsd.org 2004/08/23 14:29:23
[ssh-keysign.c]
Remove duplicate getuid(), suggested by & ok markus@
Diffstat (limited to 'ssh-keysign.c')
| -rw-r--r-- | ssh-keysign.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c index 1b1149aa..04597a91 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: ssh-keysign.c,v 1.17 2004/08/23 14:26:38 dtucker Exp $"); +RCSID("$OpenBSD: ssh-keysign.c,v 1.18 2004/08/23 14:29:23 dtucker Exp $"); #include <openssl/evp.h> #include <openssl/rand.h> @@ -151,7 +151,8 @@ main(int argc, char **argv) key_fd[0] = open(_PATH_HOST_RSA_KEY_FILE, O_RDONLY); key_fd[1] = open(_PATH_HOST_DSA_KEY_FILE, O_RDONLY); - if ((pw = getpwuid(getuid())) == NULL) + original_real_uid = getuid(); /* XXX readconf.c needs this */ + if ((pw = getpwuid(original_real_uid)) == NULL) fatal("getpwuid failed"); pw = pwcopy(pw); @@ -166,7 +167,6 @@ main(int argc, char **argv) #endif /* verify that ssh-keysign is enabled by the admin */ - original_real_uid = getuid(); /* XXX readconf.c needs this */ initialize_options(&options); (void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options, 0); fill_default_options(&options); |