Merge changes from CUPS 1.7svn-r10710.

[thirdparty/cups.git] / scheduler / client.c

diff --git a/scheduler/client.c b/scheduler/client.c
index e3c35658a50c2cb28455b48fa0303cf37fc274b6..89bda38d749927765fcaf0cdaf03bd1e1f402830 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -32,7 +32,7 @@
  *   compare_clients()     - Compare two client connections.
  *   data_ready()          - Check whether data is available from a client.
  *   get_file()            - Get a filename and state info.
- *   install_conf_file()    - Install a configuration file.
+ *   install_cupsd_conf()    - Install a configuration file.
  *   is_cgi()              - Is the resource a CGI script/program?
  *   is_path_absolute()     - Is a path absolute and free of relative elements
  *                           (i.e. "..").
@@ -98,7 +98,7 @@ static int            compare_clients(cupsd_client_t *a, cupsd_client_t *b,
 static int             data_ready(cupsd_client_t *con);
 static char            *get_file(cupsd_client_t *con, struct stat *filestats,
                                  char *filename, int len);
-static http_status_t   install_conf_file(cupsd_client_t *con);
+static http_status_t   install_cupsd_conf(cupsd_client_t *con);
 static int             is_cgi(cupsd_client_t *con, const char *filename,
                               struct stat *filestats, mime_type_t *type);
 static int             is_path_absolute(const char *path);
@@ -181,6 +181,7 @@ cupsdAcceptClient(cupsd_listener_t *lis)/* I - Listener socket */
   con->http.activity   = time(NULL);
   con->http.hostaddr   = &(con->clientaddr);
   con->http.wait_value = 10000;
+  con->http.mode       = _HTTP_MODE_SERVER;
 
  /*
   * Accept the client and get the remote address...
@@ -1669,17 +1670,14 @@ cupsdReadClient(cupsd_client_t *con)    /* I - Client to read from */
            * Validate the resource name...
            */
 
-            if (strncmp(con->uri, "/admin/conf/", 12) ||
-               strchr(con->uri + 12, '/') ||
-               strlen(con->uri) == 12)
+            if (strcmp(con->uri, "/admin/conf/cupsd.conf"))
            {
             /*
-             * PUT can only be done to configuration files under
-             * /admin/conf...
+             * PUT can only be done to the cupsd.conf file...
              */
 
              cupsdLogMessage(CUPSD_LOG_ERROR,
-                             "[Client %d] Request for subdirectory \"%s\".",
+                             "[Client %d] Disallowed PUT request for \"%s\".",
                              con->http.fd, con->uri);
 
              if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE))
@@ -2051,7 +2049,7 @@ cupsdReadClient(cupsd_client_t *con)      /* I - Client to read from */
          * Install the configuration file...
          */
 
-          status = install_conf_file(con);
+          status = install_cupsd_conf(con);
 
          /*
          * Return the status to the client...
@@ -3310,14 +3308,13 @@ get_file(cupsd_client_t *con,           /* I  - Client connection */
 
 
 /*
- * 'install_conf_file()' - Install a configuration file.
+ * 'install_cupsd_conf()' - Install a configuration file.
  */
 
 static http_status_t                   /* O - Status */
-install_conf_file(cupsd_client_t *con) /* I - Connection */
+install_cupsd_conf(cupsd_client_t *con)        /* I - Connection */
 {
   char         filename[1024];         /* Configuration filename */
-  mode_t       mode;                   /* Permissions */
   cups_file_t  *in,                    /* Input file */
                *out;                   /* Output file */
   char         buffer[16384];          /* Copy buffer */
@@ -3339,13 +3336,8 @@ install_conf_file(cupsd_client_t *con)   /* I - Connection */
   * Open the new config file...
   */
 
-  snprintf(filename, sizeof(filename), "%s%s", ServerRoot, con->uri + 11);
-  if (!strcmp(con->uri, "/admin/conf/printers.conf"))
-    mode = ConfigFilePerm & 0600;
-  else
-    mode = ConfigFilePerm;
-
-  if ((out = cupsdCreateConfFile(filename, mode)) == NULL)
+  snprintf(filename, sizeof(filename), "%s/cupsd.conf", ServerRoot);
+  if ((out = cupsdCreateConfFile(filename, ConfigFilePerm)) == NULL)
   {
     cupsFileClose(in);
     return (HTTP_SERVER_ERROR);
@@ -3390,14 +3382,10 @@ install_conf_file(cupsd_client_t *con)  /* I - Connection */
   cupsdClearString(&con->filename);
 
  /*
-  * If the cupsd.conf file was updated, set the NeedReload flag...
+  * Set the NeedReload flag...
   */
 
-  if (!strcmp(con->uri, "/admin/conf/cupsd.conf"))
-    NeedReload = RELOAD_CUPSD;
-  else
-    NeedReload = RELOAD_ALL;
-
+  NeedReload = RELOAD_CUPSD;
   ReloadTime = time(NULL);
 
  /*