Mirror 1.1.x changes.

[thirdparty/cups.git] / systemv / accept.c

diff --git a/systemv/accept.c b/systemv/accept.c
index b4883eebd8077f626813db88c9a7886ff2770248..249598751d39b4430940fdd8da4d6c523af4a833 100644 (file)
--- a/systemv/accept.c
+++ b/systemv/accept.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: accept.c,v 1.11.2.6 2002/05/16 14:00:17 mike Exp $"
+ * "$Id: accept.c,v 1.11.2.7 2002/08/22 01:43:39 mike Exp $"
  *
  *   "accept", "disable", "enable", and "reject" commands for the Common
  *   UNIX Printing System (CUPS).
@@ -49,19 +49,13 @@ main(int  argc,                     /* I - Number of command-line arguments */
   http_t       *http;          /* HTTP connection to server */
   int          i;              /* Looping var */
   char         *command,       /* Command to do */
-               hostname[HTTP_MAX_URI],
-                               /* Name of host */
-               printer[HTTP_MAX_URI],
-                               /* Name of printer or class */
                uri[1024],      /* Printer URI */
                *reason;        /* Reason for reject/disable */
-  const char   *server;        /* Server name */
   ipp_t                *request;       /* IPP request */
   ipp_t                *response;      /* IPP response */
   ipp_op_t     op;             /* Operation */
   cups_lang_t  *language;      /* Language */
   int          cancel;         /* Cancel jobs? */
-  http_encryption_t encryption;        /* Encryption? */
 
 
  /*
@@ -89,10 +83,8 @@ main(int  argc,                      /* I - Number of command-line arguments */
     return (1);
   }
 
-  server     = cupsServer();
-  http       = NULL;
-  reason     = NULL;
-  encryption = cupsEncryption();
+  http   = NULL;
+  reason = NULL;
 
  /*
   * Process command-line arguments...
@@ -104,13 +96,13 @@ main(int  argc,                    /* I - Number of command-line arguments */
       {
         case 'E' : /* Encrypt */
 #ifdef HAVE_LIBSSL
-           encryption = HTTP_ENCRYPT_REQUIRED;
+           cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 
            if (http)
-             httpEncryption(http, encryption);
+             httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
 #else
             fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
-                   argv[0]);
+                   command);
 #endif /* HAVE_LIBSSL */
            break;
 
@@ -123,7 +115,7 @@ main(int  argc,                     /* I - Number of command-line arguments */
              httpClose(http);
 
            if (argv[i][2] != '\0')
-             server = argv[i] + 2;
+             cupsSetServer(argv[i] + 2);
            else
            {
              i ++;
@@ -134,16 +126,7 @@ main(int  argc,                    /* I - Number of command-line arguments */
                return (1);
              }
 
-              server = argv[i];
-           }
-
-            http = httpConnectEncrypt(server, ippPort(), encryption);
-
-           if (http == NULL)
-           {
-             fputs(argv[0], stderr);
-             perror(": Unable to connect to server");
-             return (1);
+              cupsSetServer(argv[i]);
            }
            break;
 
@@ -174,21 +157,12 @@ main(int  argc,                   /* I - Number of command-line arguments */
       * Accept/disable/enable/reject a destination...
       */
 
-      if (sscanf(argv[i], "%1023[^@]@%1023s", printer, hostname) == 1)
-       strlcpy(hostname, server, sizeof(hostname));
-
-      if (http != NULL && strcasecmp(http->hostname, hostname) != 0)
-      {
-       httpClose(http);
-       http = NULL;
-      }
-
       if (http == NULL)
-        http = httpConnectEncrypt(hostname, ippPort(), encryption);
+        http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
 
       if (http == NULL)
       {
-       fputs(argv[0], stderr);
+       fputs(command, stderr);
        perror(": Unable to connect to server");
        return (1);
       }
@@ -216,7 +190,7 @@ main(int  argc,                     /* I - Number of command-line arguments */
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
                    "attributes-natural-language", NULL, language->language);
 
-      snprintf(uri, sizeof(uri), "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
+      snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", argv[i]);
       ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
                    "printer-uri", NULL, uri);
 
@@ -274,7 +248,6 @@ main(int  argc,                     /* I - Number of command-line arguments */
        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
                      "attributes-natural-language", NULL, language->language);
 
-       snprintf(uri, sizeof(uri), "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
        ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
                      "printer-uri", NULL, uri);
 
@@ -306,5 +279,5 @@ main(int  argc,                     /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: accept.c,v 1.11.2.6 2002/05/16 14:00:17 mike Exp $".
+ * End of "$Id: accept.c,v 1.11.2.7 2002/08/22 01:43:39 mike Exp $".
  */