Update cups-x509 and cups-oauth commands to be consistent with man pages.

diff --git a/tools/cups-oauth.c b/tools/cups-oauth.c
index aa128f08efb294eccaaad16292ca35ab022ddfd7..71cf65a6ff343e696327eace895370a7dca5d8b9 100644 (file)
--- a/tools/cups-oauth.c
+++ b/tools/cups-oauth.c
@@ -6,7 +6,7 @@
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
 //
-// Usage: cups-oauth [OPTIONS] [COMMAND [ARGUMENT(S)]]
+// Usage: cups-oauth [OPTIONS] [SUB-COMMAND [ARGUMENT(S)]]
 //
 // Commands:
 //
@@ -520,9 +520,9 @@ do_set_client_data(
 static int                             // O - Exit status
 usage(FILE *out)                       // I - Output file
 {
-  _cupsLangPuts(out, _("Usage: cups-oauth [OPTIONS] [COMMAND [ARGUMENT(S)]]"));
+  _cupsLangPuts(out, _("Usage: cups-oauth [OPTIONS] [SUB-COMMAND [ARGUMENT(S)]]"));
   _cupsLangPuts(out, "");
-  _cupsLangPuts(out, _("Commands:"));
+  _cupsLangPuts(out, _("Sub-Commands:"));
   _cupsLangPuts(out, "");
   _cupsLangPuts(out, _("authorize [RESOURCE]           Authorize access to a resource"));
   _cupsLangPuts(out, _("clear [RESOURCE]               Clear the authorization for a resource"));

diff --git a/tools/cups-x509.c b/tools/cups-x509.c
index fd01690dd292cb44afe2a37781764967f8d35c97..482a647c137c496de3b8072a88a54e018b00b524 100644 (file)
--- a/tools/cups-x509.c
+++ b/tools/cups-x509.c
@@ -66,7 +66,7 @@
 
 static int     do_ca(const char *common_name, const char *csrfile, const char *root_name, int days);
 static int     do_cert(bool ca_cert, cups_credpurpose_t purpose, cups_credtype_t type, cups_credusage_t keyusage, const char *organization, const char *org_unit, const char *locality, const char *state, const char *country, const char *root_name, const char *common_name, size_t num_alt_names, const char **alt_names, int days);
-static int     do_client(const char *uri);
+static int     do_client(const char *uri, bool pin, bool require_ca);
 static int     do_csr(cups_credpurpose_t purpose, cups_credtype_t type, cups_credusage_t keyusage, const char *organization, const char *org_unit, const char *locality, const char *state, const char *country, const char *common_name, size_t num_alt_names, const char **alt_names);
 static int     do_server(const char *host_port);
 static int     do_show(const char *common_name);
@@ -93,6 +93,8 @@ main(int  argc,                               // I - Number of command-line arguments
                *state = NULL,          // State/province
                *country = NULL,        // Country
                *alt_names[100];        // Subject alternate names
+  bool         pin = false,            // Pin client cert?
+               require_ca = false;     // Require a CA-signed cert?
   size_t       num_alt_names = 0;
   int          days = 365;             // Days until expiration
   cups_credpurpose_t purpose = CUPS_CREDPURPOSE_SERVER_AUTH;
@@ -110,6 +112,14 @@ main(int  argc,                            // I - Number of command-line arguments
     {
       return (usage(stdout));
     }
+    else if (!strcmp(argv[i], "--pin"))
+    {
+      pin = true;
+    }
+    else if (!strcmp(argv[i], "--require-ca"))
+    {
+      require_ca = true;
+    }
     else if (!strcmp(argv[i], "--version"))
     {
       puts(CUPS_SVERSION);
@@ -373,7 +383,7 @@ main(int  argc,                             // I - Number of command-line arguments
   }
   else if (!strcmp(command, "client"))
   {
-    return (do_client(arg));
+    return (do_client(arg, pin, require_ca));
   }
   else if (!strcmp(command, "csr"))
   {
@@ -538,12 +548,12 @@ do_cert(
 //
 
 static int                             // O - Exit status
-do_client(const char *uri)             // I - URI
+do_client(const char *uri,             // I - URI
+          bool       pin,              // I - Pin the cert?
+          bool       require_ca)       // I - Require a CA-signed cert?
 {
   http_t       *http;                  // HTTP connection
-  char         scheme[HTTP_MAX_URI],   // Scheme from URI
-               hostname[HTTP_MAX_URI], // Hostname from URI
-               username[HTTP_MAX_URI], // Username:password from URI
+  char         hostname[HTTP_MAX_URI], // Hostname from URI
                resource[HTTP_MAX_URI]; // Resource from URI
   int          port;                   // Port number from URI
   http_trust_t trust;                  // Trust evaluation for connection
@@ -555,15 +565,9 @@ do_client(const char *uri)         // I - URI
 
 
   // Connect to the host and validate credentials...
-  if (httpSeparateURI(HTTP_URI_CODING_MOST, uri, scheme, sizeof(scheme), username, sizeof(username), hostname, sizeof(hostname), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK)
+  if ((http = httpConnectURI(uri, hostname, sizeof(hostname), &port, resource, sizeof(resource), /*blocking*/true, /*msec*/30000, /*cancel*/NULL, require_ca)) == NULL)
   {
-    _cupsLangPrintf(stderr, _("cups-x509: Bad URI '%s'."), uri);
-    return (1);
-  }
-
-  if ((http = httpConnect2(hostname, port, NULL, AF_UNSPEC, HTTP_ENCRYPTION_ALWAYS, 1, 30000, NULL)) == NULL)
-  {
-    _cupsLangPrintf(stderr, _("cups-x509: Unable to connect to '%s' on port %d: %s"), hostname, port, cupsGetErrorString());
+    _cupsLangPrintf(stderr, _("cups-x509: Unable to connect to '%s': %s"), uri, cupsGetErrorString());
     return (1);
   }
 
@@ -574,7 +578,6 @@ do_client(const char *uri)          // I - URI
 
     cupsGetCredentialsInfo(hcreds, hinfo, sizeof(hinfo));
 
-//    printf("    Certificate Count: %u\n", (unsigned)cupsArrayGetCount(hcreds));
     if (trust == HTTP_TRUST_OK)
       puts("    Trust: OK");
     else
@@ -583,6 +586,9 @@ do_client(const char *uri)          // I - URI
     printf("     ValidName: %s\n", cupsAreCredentialsValidForName(hostname, hcreds) ? "true" : "false");
     printf("          Info: \"%s\"\n", hinfo);
 
+    if (pin)
+      cupsSaveCredentials(/*path*/NULL, hostname, hcreds, /*key*/NULL);
+
     free(hcreds);
   }
   else
@@ -834,9 +840,9 @@ do_show(const char *common_name)    // I - Common name
 static int                             // O - Exit code
 usage(FILE *out)                       // I - Output file (stdout or stderr)
 {
-  _cupsLangPuts(out, _("Usage: cups-x509 [OPTIONS] [COMMAND] [ARGUMENT]"));
+  _cupsLangPuts(out, _("Usage: cups-x509 [OPTIONS] [SUB-COMMAND] [ARGUMENT]"));
   _cupsLangPuts(out, "");
-  _cupsLangPuts(out, _("Commands:"));
+  _cupsLangPuts(out, _("Sub-Commands:"));
   _cupsLangPuts(out, "");
   _cupsLangPuts(out, _("ca COMMON-NAME             Sign a CSR to produce a certificate."));
   _cupsLangPuts(out, _("cacert COMMON-NAME         Create a CA certificate."));