From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 24 Jan 2019 17:04:57 +0000 (-0500)
Subject: Update usage and localized message about the URL to use for secure access.
X-Git-Tag: v2.3b8~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc71486c92af6fa25f98848ea25f3f6413a8273;p=thirdparty%2Fcups.git

Update usage and localized message about the URL to use for secure access.
---

diff --git a/scheduler/client.c b/scheduler/client.c
index cfb0e1b9bd..c649472488 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1986,18 +1986,9 @@ cupsdSendError(cupsd_client_t *con,	/* I - Connection */
     {
       text = urltext;
 
-      snprintf(urltext, sizeof(urltext),
-               _cupsLangString(con->language,
-                               _("You must access this page using the URL "
-			         "<A HREF=\"https://%s:%d%s\">"
-				 "https://%s:%d%s</A>.")),
-               con->servername, con->serverport, con->uri,
-	       con->servername, con->serverport, con->uri);
-
-      snprintf(redirect, sizeof(redirect),
-               "<META HTTP-EQUIV=\"Refresh\" "
-	       "CONTENT=\"3;URL=https://%s:%d%s\">\n",
-	       con->servername, con->serverport, con->uri);
+      snprintf(urltext, sizeof(urltext), _cupsLangString(con->language, _("You must access this page using the URL https://%s:%d%s.")), con->servername, con->serverport, con->uri);
+
+      snprintf(redirect, sizeof(redirect), "<META HTTP-EQUIV=\"Refresh\" CONTENT=\"3;URL=https://%s:%d%s\">\n", con->servername, con->serverport, con->uri);
     }
     else if (code == HTTP_STATUS_CUPS_WEBIF_DISABLED)
       text = _cupsLangString(con->language,
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index 4a8bc26c3e..709949a629 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -669,20 +669,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     unlink(evefile);
 
   if (printer == NULL)
-  {
-    _cupsLangPuts(stdout,
-	          _("Usage:\n"
-		    "\n"
-		    "    lpadmin [-h server] -d destination\n"
-		    "    lpadmin [-h server] -x destination\n"
-		    "    lpadmin [-h server] -p printer [-c add-class] "
-		    "[-i interface] [-m model]\n"
-		    "                       [-r remove-class] [-v device] "
-		    "[-D description]\n"
-		    "                       [-P ppd-file] [-o name=value]\n"
-		    "                       [-u allow:user,user] "
-		    "[-u deny:user,user]"));
-  }
+    usage();
 
   if (http)
     httpClose(http);