diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.254 2002/06/30 21:54:16 deraadt Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.255 2002/06/30 21:59:45 deraadt Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -550,7 +550,7 @@ privsep_preauth_child(void) | |||
550 | memset(pw->pw_passwd, 0, strlen(pw->pw_passwd)); | 550 | memset(pw->pw_passwd, 0, strlen(pw->pw_passwd)); |
551 | endpwent(); | 551 | endpwent(); |
552 | 552 | ||
553 | /* Change our root directory*/ | 553 | /* Change our root directory */ |
554 | if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) | 554 | if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) |
555 | fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, | 555 | fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, |
556 | strerror(errno)); | 556 | strerror(errno)); |
@@ -573,7 +573,7 @@ privsep_preauth_child(void) | |||
573 | #endif | 573 | #endif |
574 | } | 574 | } |
575 | 575 | ||
576 | static Authctxt* | 576 | static Authctxt * |
577 | privsep_preauth(void) | 577 | privsep_preauth(void) |
578 | { | 578 | { |
579 | Authctxt *authctxt = NULL; | 579 | Authctxt *authctxt = NULL; |
@@ -958,7 +958,8 @@ main(int ac, char **av) | |||
958 | debug("sshd version %.100s", SSH_VERSION); | 958 | debug("sshd version %.100s", SSH_VERSION); |
959 | 959 | ||
960 | /* load private host keys */ | 960 | /* load private host keys */ |
961 | sensitive_data.host_keys = xmalloc(options.num_host_key_files*sizeof(Key*)); | 961 | sensitive_data.host_keys = xmalloc(options.num_host_key_files * |
962 | sizeof(Key *)); | ||
962 | for (i = 0; i < options.num_host_key_files; i++) | 963 | for (i = 0; i < options.num_host_key_files; i++) |
963 | sensitive_data.host_keys[i] = NULL; | 964 | sensitive_data.host_keys[i] = NULL; |
964 | sensitive_data.server_key = NULL; | 965 | sensitive_data.server_key = NULL; |