From 99ebdb4bd9874c566623bce87b913abf13285716 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 30 Jan 2015 16:04:48 +0100 Subject: [PATCH] sysdb: Added -K and -C options to specify SSL key and cert files. --- src/tools/sysdb/main.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c index a8dbf27..228cd53 100644 --- a/src/tools/sysdb/main.c +++ b/src/tools/sysdb/main.c @@ -120,18 +120,28 @@ exit_usage(char *name, int status) printf( "Usage: %s \n" -"\nOptions:\n" -" -H HOST the host to connect to\n" -" default: "DEFAULT_SOCKET"\n" -" -U USER the username to connect as\n" -" default: %s\n" -" -c CMD execute the specified command and then exit\n" +"Connection options:\n" +" -H HOST the host to connect to\n" +" default: "DEFAULT_SOCKET"\n" +" -U USER the username to connect as\n" +" default: %s\n" +" -c CMD execute the specified command and then exit\n" "\n" -" -h display this help and exit\n" -" -V display the version number and copyright\n" +"SSL options:\n" +" -K KEYFILE private key file name\n" +" default: %s\n" +" -C CERTFILE client certificate file name\n" +" default: %s\n" +"\n" +"General options:\n" +"\n" +" -h display this help and exit\n" +" -V display the version number and copyright\n" "\nSysDB client "SDB_CLIENT_VERSION_STRING SDB_CLIENT_VERSION_EXTRA", " -PACKAGE_URL"\n", basename(name), user); +PACKAGE_URL"\n", basename(name), user, + ssl_options.key_file, ssl_options.cert_file); + free(user); exit(status); } /* exit_usage */ @@ -217,7 +227,7 @@ main(int argc, char **argv) sdb_llist_t *commands = NULL; while (42) { - int opt = getopt(argc, argv, "H:U:c:hV"); + int opt = getopt(argc, argv, "H:U:c:C:K:hV"); if (-1 == opt) break; @@ -254,6 +264,13 @@ main(int argc, char **argv) } break; + case 'C': + ssl_options.cert_file = optarg; + break; + case 'K': + ssl_options.key_file = optarg; + break; + case 'h': exit_usage(argv[0], 0); break; -- 2.30.2