Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3428 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 75332b99244cff1f805a6e709ab1ac538cc7bfd4..81c890ab40584162e3e484c173b1dbf97b3f24d7 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.36.2.7 2003/01/07 18:27:14 mike Exp $"
+# "$Id: Makefile,v 1.36.2.8 2003/03/05 20:59:38 mike Exp $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -69,8 +69,8 @@ install:      all
        $(INSTALL_DIR) $(SERVERROOT)/interfaces
        $(INSTALL_DIR) $(SERVERROOT)/ppd
        $(INSTALL_DIR) $(LOGDIR)
-       $(INSTALL_DIR) -m 700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)
-       $(INSTALL_DIR) -m 1700 -o $(CUPS_USER) -g $(CUPS_GROUP) $(REQUESTS)/tmp
+       $(INSTALL_DIR) -m 710 $(REQUESTS)
+       $(INSTALL_DIR) -m 1710 $(REQUESTS)/tmp
 
 
 #
@@ -138,5 +138,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.36.2.7 2003/01/07 18:27:14 mike Exp $".
+# End of "$Id: Makefile,v 1.36.2.8 2003/03/05 20:59:38 mike Exp $".
 #

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 8ba5ef81b4ef1a73c5fd519374b5adac9237435e..2cc6bf1baf3534755643e60af02d31ae69a5d83f 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.77.2.30 2003/02/05 21:14:49 mike Exp $"
+ * "$Id: conf.c,v 1.77.2.31 2003/03/05 20:59:38 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -483,10 +483,10 @@ ReadConfiguration(void)
   if (ServerCertificate[0] != '/')
     SetStringf(&ServerCertificate, "%s/%s", ServerRoot, ServerCertificate);
 
+#  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
   chown(ServerCertificate, run_user, Group);
   chmod(ServerCertificate, ConfigFilePerm);
 
-#  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
   if (ServerKey[0] != '/')
     SetStringf(&ServerKey, "%s/%s", ServerRoot, ServerKey);
 
@@ -508,7 +508,7 @@ ReadConfiguration(void)
   chmod(temp, 0711);
 
   snprintf(temp, sizeof(temp), "%s/ppd", ServerRoot);
-  chown(temp, User, Group);
+  chown(temp, run_user, Group);
   chmod(temp, 0755);
 
   snprintf(temp, sizeof(temp), "%s/ssl", ServerRoot);
@@ -521,11 +521,19 @@ ReadConfiguration(void)
 
   snprintf(temp, sizeof(temp), "%s/classes.conf", ServerRoot);
   chown(temp, run_user, Group);
+#ifdef __APPLE__
+  chmod(temp, 0600);
+#else
   chmod(temp, ConfigFilePerm);
+#endif /* __APPLE__ */
 
   snprintf(temp, sizeof(temp), "%s/printers.conf", ServerRoot);
   chown(temp, run_user, Group);
+#ifdef __APPLE__
+  chmod(temp, 0600);
+#else
   chmod(temp, ConfigFilePerm);
+#endif /* __APPLE__ */
 
   snprintf(temp, sizeof(temp), "%s/passwd.md5", ServerRoot);
   chown(temp, User, Group);
@@ -2189,5 +2197,5 @@ CDSAGetServerCerts(void)
 
 
 /*
- * End of "$Id: conf.c,v 1.77.2.30 2003/02/05 21:14:49 mike Exp $".
+ * End of "$Id: conf.c,v 1.77.2.31 2003/03/05 20:59:38 mike Exp $".
  */