diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:40:50 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:40:50 +0000 |
| commit | 11a09ab416e21c995885dc0e5847151627094217 (patch) | |
| tree | 7767975616a98948a7ef791c43b28a21711a22c7 /crypto/openssh/ssh-keysign.c | |
| parent | d5d493f03ae792146848e3cba16bb9e667c73125 (diff) | |
| download | FreeBSD-src-11a09ab416e21c995885dc0e5847151627094217.zip FreeBSD-src-11a09ab416e21c995885dc0e5847151627094217.tar.gz | |
Vendor import of OpenSSH 4.0p1.
Diffstat (limited to 'crypto/openssh/ssh-keysign.c')
| -rw-r--r-- | crypto/openssh/ssh-keysign.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-keysign.c b/crypto/openssh/ssh-keysign.c index 5176557..04597a9 100644 --- a/crypto/openssh/ssh-keysign.c +++ b/crypto/openssh/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.16 2004/04/18 23:10:26 djm 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); |
