Date: Tue, 18 Aug 2015 15:26:10 GMT From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289883 - soc2013/def/crashdump-head/sbin/cryptcore Message-ID: <201508181526.t7IFQAeO076958@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: def Date: Tue Aug 18 15:26:09 2015 New Revision: 289883 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289883 Log: Print to stdout by default. Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c ============================================================================== --- soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Tue Aug 18 15:15:04 2015 (r289882) +++ soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Tue Aug 18 15:26:09 2015 (r289883) @@ -30,8 +30,8 @@ { pjdlog_exitx(1, "%s\n%s", - "usage: cryptcore genkey [-Fv] -p publickey", - " cryptcore decrypt [-Fv] -p privatekey -k encryptedkey -i encryptedcore -o decryptedcore"); + "usage: cryptcore genkey [-Lv] -p publickey", + " cryptcore decrypt [-Lv] -p privatekey -k encryptedkey -i encryptedcore -o decryptedcore"); } static int @@ -384,7 +384,7 @@ const char *input, *keyfile, *optstr, *output, *rsakeyfile; int cmd, debug; char ch; - bool foreground; + bool usesyslog; pjdlog_init(PJDLOG_MODE_STD); pjdlog_prefix_set("(cryptcore) "); @@ -395,23 +395,23 @@ optstr = NULL; if (strcmp("genkey", argv[1]) == 0) { cmd = CRYPTCORE_CMD_GENKEY; - optstr = "Fp:v"; + optstr = "Lp:v"; } else if (strcmp("decrypt", argv[1]) == 0) { cmd = CRYPTCORE_CMD_DECRYPT; - optstr = "Fi:k:o:p:v"; + optstr = "Li:k:o:p:v"; } else { usage(); } argc--; argv++; - foreground = false; debug = 0; rsakeyfile = NULL; + usesyslog = false; while ((ch = getopt(argc, argv, optstr)) != -1) { switch (ch) { - case 'F': - foreground = true; + case 'L': + usesyslog = true; break; case 'i': input = optarg; @@ -451,7 +451,7 @@ break; } - if (!foreground) + if (usesyslog) pjdlog_mode_set(PJDLOG_MODE_SYSLOG); pjdlog_debug_set(debug);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508181526.t7IFQAeO076958>