diff --git a/client/config_init.c b/client/config_init.c index ff961f16..3be24818 100644 --- a/client/config_init.c +++ b/client/config_init.c @@ -2517,7 +2517,7 @@ usage(void) " -A, --access Provide a list of ports/protocols to open\n" " on the server (e.g. 'tcp/22').\n" " -a, --allow-ip Specify IP address to allow within the SPA\n" - " packet (e.g. '123.2.3.4'). If \n" + " packet (e.g. '123.2.3.4').\n" " -D, --destination Specify the hostname or IP address of the\n" " fwknop server.\n" " --use-hmac Add an HMAC to the outbound SPA packet for\n" @@ -2572,12 +2572,12 @@ usage(void) " line args as the last time it was executed\n" " (args are read from the ~/.fwknop.run file).\n" " -G, --get-key Load an encryption key/password from a file.\n" - " --stdin Read the encryption key/password from stdin\n" + " --stdin Read the encryption key/password from stdin.\n" " --fd Specify the file descriptor to read the\n" " encryption key/password from.\n" " -k, --key-gen Generate SPA Rijndael + HMAC keys.\n" " -K, --key-gen-file Write generated Rijndael + HMAC keys to a\n" - " file\n" + " file.\n" " --key-rijndael Specify the Rijndael key. Since the password is\n" " visible to utilities (like 'ps' under Unix)\n" " this form should only be used where security is\n" @@ -2614,8 +2614,8 @@ usage(void) " --hmac-digest-type Set the HMAC digest algorithm (default is\n" " sha256). Options are md5, sha1, sha256,\n" " sha384, or sha512.\n" - " --icmp-type Set the ICMP type (used with '-P icmp')\n" - " --icmp-code Set the ICMP code (used with '-P icmp')\n" + " --icmp-type Set the ICMP type (used with '-P icmp').\n" + " --icmp-code Set the ICMP code (used with '-P icmp').\n" " --gpg-encryption Use GPG encryption (default is Rijndael).\n" " --gpg-recipient-key Specify the recipient GPG key name or ID.\n" " --gpg-signer-key Specify the signer's GPG key name or ID.\n" @@ -2625,18 +2625,18 @@ usage(void) " --gpg-agent Use GPG agent if available.\n" " --gpg-exe Set path to GPG binary.\n" " --no-save-args Do not save fwknop command line args to the\n" - " $HOME/fwknop.run file\n" + " $HOME/fwknop.run file.\n" " --rc-file Specify path to the fwknop rc file (default\n" - " is $HOME/.fwknoprc)\n" + " is $HOME/.fwknoprc).\n" " --server-resolve-ipv4 Force IPv4 address resolution from DNS for\n" " SPA server when using a hostname.\n" " --save-rc-stanza Save command line arguments to the\n" " $HOME/.fwknoprc stanza specified with the\n" " -n option.\n" " --force-stanza Used with --save-rc-stanza to overwrite all of\n" - " the variables for the specified stanza\n" + " the variables for the specified stanza.\n" " --stanza-list Dump a list of the stanzas found in\n" - " $HOME/.fwknoprc\n" + " $HOME/.fwknoprc.\n" " --nat-local Access a local service via a forwarded port\n" " on the fwknopd server system.\n" " --nat-port Specify the port to forward to access a\n" diff --git a/client/spa_comm.c b/client/spa_comm.c index 1afd914c..0458a4a7 100644 --- a/client/spa_comm.c +++ b/client/spa_comm.c @@ -170,7 +170,7 @@ send_spa_packet_tcp_or_udp(const char *spa_data, const int sd_len, if (! sock_success) { log_msg(LOG_VERBOSITY_ERROR, - "send_spa_packet_tcp_or_udp: Could not create socket: ", + "send_spa_packet_tcp_or_udp: Could not create socket: %s", strerror(errno)); return -1; } diff --git a/server/config_init.c b/server/config_init.c index 7f231336..58519094 100644 --- a/server/config_init.c +++ b/server/config_init.c @@ -1491,7 +1491,7 @@ usage(void) fprintf(stdout, "Usage: fwknopd [options]\n\n" " -a, --access-file - Specify an alternate access.conf file.\n" - " --access-folder - Specify an access.conf folder. All .conf\n" + " --access-folder - Specify an access.conf folder. All .conf\n" " files in this folder will be processed.\n" " -c, --config-file - Specify an alternate configuration file.\n" " -f, --foreground - Run fwknopd in the foreground (do not become\n" @@ -1510,7 +1510,7 @@ usage(void) " back to UDP server mode if not used).\n" #endif " -O, --override-config - Specify a file with configuration entries that will\n" - " override those in fwknopd.conf\n" + " override those in fwknopd.conf.\n" " -p, --pid-file - Specify an alternate fwknopd.pid file.\n" " -P, --pcap-filter - Specify a Berkeley packet filter statement to\n" " override the PCAP_FILTER variable in fwknopd.conf.\n" @@ -1535,7 +1535,7 @@ usage(void) " --dump-serv-err-codes - List all server error codes (only needed by the\n" " test suite).\n" " --exit-parse-config - Parse config files and exit.\n" - " --exit-parse-digest-cache - Parse and validate digest cache and exit.\n" + " --exit-parse-digest-cache - Parse and validate digest cache and exit.\n" " --fault-injection-tag - Enable a fault injection tag (only needed by the\n" " test suite).\n" " --pcap-file - Read potential SPA packets from an existing pcap\n"