summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0333ba30d..2f6d02306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - jmc@cvs.openbsd.org 2004/06/26 09:14:40 13 - jmc@cvs.openbsd.org 2004/06/26 09:14:40
14 [sshd_config.5] 14 [sshd_config.5]
15 new sentence, new line; 15 new sentence, new line;
16 - avsm@cvs.openbsd.org 2004/06/26 20:07:16
17 [sshd.c]
18 initialise some fd variables to -1, djm@ ok
16 19
1720040627 2020040627
18 - (tim) update README files. 21 - (tim) update README files.
@@ -1459,4 +1462,4 @@
1459 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1462 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1460 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1463 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1461 1464
1462$Id: ChangeLog,v 1.3461 2004/06/30 12:39:34 djm Exp $ 1465$Id: ChangeLog,v 1.3462 2004/06/30 12:40:20 djm Exp $
diff --git a/sshd.c b/sshd.c
index e5f54cbe6..101419bed 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.296 2004/06/25 18:43:36 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.297 2004/06/26 20:07:16 avsm Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -874,7 +874,8 @@ main(int ac, char **av)
874{ 874{
875 extern char *optarg; 875 extern char *optarg;
876 extern int optind; 876 extern int optind;
877 int opt, sock_in = 0, sock_out = 0, newsock, j, i, fdsetsz, on = 1; 877 int opt, j, i, fdsetsz, on = 1;
878 int sock_in = -1, sock_out = -1, newsock = -1;
878 pid_t pid; 879 pid_t pid;
879 socklen_t fromlen; 880 socklen_t fromlen;
880 fd_set *fdset; 881 fd_set *fdset;