X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/c5d10563138ba0f06f531c176e59ba06401386f5..e8e24c8054719b9f31c7dc7b7b43342adc07a50c:/ssh-rand-helper.c

diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 662f7008..0fcda7ff 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -28,12 +28,25 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #ifdef HAVE_SYS_UN_H
 # include <sys/un.h>
 #endif
 
+#include <errno.h>
+#include <fcntl.h>
+#include <pwd.h>
 #include <signal.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <openssl/rand.h>
 #include <openssl/sha.h>
@@ -573,7 +586,8 @@ prng_write_seedfile(void)
 	/* Try to ensure that the parent directory is there */
 	snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
 	    _PATH_SSH_USER_DIR);
-	mkdir(filename, 0700);
+	if (mkdir(filename, 0700) < 0 && errno != EEXIST)
+		fatal("mkdir %.200s: %s", filename, strerror(errno));
 
 	snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
 	    SSH_PRNG_SEED_FILE);
@@ -674,8 +688,7 @@ prng_read_commands(char *cmdfilename)
 	}
 
 	num_cmds = 64;
-	entcmd = xmalloc(num_cmds * sizeof(entropy_cmd_t));
-	memset(entcmd, '\0', num_cmds * sizeof(entropy_cmd_t));
+	entcmd = xcalloc(num_cmds, sizeof(entropy_cmd_t));
 
 	/* Read in file */
 	cur_cmd = linenum = 0;
@@ -783,6 +796,7 @@ prng_read_commands(char *cmdfilename)
 	debug("Loaded %d entropy commands from %.100s", cur_cmd,
 	    cmdfilename);
 
+	fclose(f);
 	return cur_cmd < MIN_ENTROPY_SOURCES ? -1 : 0;
 }
 
@@ -839,11 +853,17 @@ main(int argc, char **argv)
 		default:
 			error("Invalid commandline option");
 			usage();
+			exit(1);
 		}
 	}
-
 	log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
 
+	if (argc != optind) {
+		error("Unexpected commandline arguments.");
+		usage();
+		exit(1);
+	}
+
 #ifdef USE_SEED_FILES
 	prng_read_seedfile();
 #endif