- (djm) [ssh-rand-helper.c] Print error and usage() when passed command-

   line arguments as none are supported. Exit when passed unrecognised
   commandline flags. bz#1568 from gson AT araneus.fi

diff --git a/ChangeLog b/ChangeLog
index 566167053ea32316ea801bb89218d87a9be0d4f0..e477a8fc3da655305097ddbe125251acf582a004 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-20091107
+20091120
+ - (djm) [ssh-rand-helper.c] Print error and usage() when passed command-
+   line arguments as none are supported. Exit when passed unrecognised
+   commandline flags. bz#1568 from gson AT araneus.fi
+
+20091118
  - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to
    set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify
    setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only()

diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 8b1c4b4f47bf034f52ce117dceaebd24daa3b361..0fcda7fff169f8b9ea2b0b959ab0b34158a2b776 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -853,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