Remove unused SignalCount variable, and fix permissions of certs dir.

scheduler/conf.c:
    - ReadConfiguration(): Permissions of certs directory should
      be 710 for non-root and 510 for root.

scheduler/cupsd.h:
    - Drop SignalCount variable.

scheduler/log.c:
    - LogMessage(): Don't use SignalCount var anymore.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4699 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 2649d83ccbe19fed67909cdf604a803c1e7c7d1e..54b4ec03723a99c76f57fa6185dcf4368c54866c 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -619,9 +619,12 @@ ReadConfiguration(void)
 
   snprintf(temp, sizeof(temp), "%s/certs", StateDir);
   if (access(temp, 0))
-    mkdir(temp, 0710);
-  chown(temp, RunUser, SystemGroupIDs[0]);
-  chmod(temp, 0710);
+    mkdir(temp, 0510);
+  chown(temp, User, SystemGroupIDs[0]);
+  if (RunUser)
+    chmod(temp, 0710);
+  else
+    chmod(temp, 0510);
 
   chown(ServerRoot, RunUser, Group);
   chmod(ServerRoot, 0755);

diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 1705fd0f9ab87b3462b024dc58fb5845e4aec09c..efc7d0f2fce8ec7444e0ae0277756bd4f0a22d01 100644 (file)
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -157,10 +157,8 @@ VAR fd_set         *InputSet,      /* Input files for select() */
 
 VAR time_t             ReloadTime      VALUE(0);
                                        /* Time of reload request... */
-VAR int                        NeedReload      VALUE(RELOAD_ALL),
+VAR int                        NeedReload      VALUE(RELOAD_ALL);
                                        /* Need to load configuration? */
-                       SignalCount     VALUE(0);
-                                       /* Signal handler level */
 
 
 /*

diff --git a/scheduler/log.c b/scheduler/log.c
index 4158a645cb476e0ed17a2024956297dc701df3d7..5ff15e5e28ed190b97038ef9d9076f0e3787ed94 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -411,10 +411,10 @@ check_log_file(cups_file_t **lf,  /* IO - Log file */
 
 
  /*
-  * See if we have a log file to check or we are handling a signal...
+  * See if we have a log file to check...
   */
 
-  if (!lf || !logname || !logname[0] || SignalCount)
+  if (!lf || !logname || !logname[0])
     return (1);
 
  /*