Apple changes.

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

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 80d30a1c6761aa60f606bf0ff8ec135862c3fd64..c812384d92e4434c253cfa39ceed40c78ff801d4 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.46 2002/12/17 19:00:12 swdev Exp $"
+# "$Id: Makefile,v 1.47 2003/03/05 20:42:28 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 $(REQUESTS)
-       $(INSTALL_DIR) -m 1700 $(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.46 2002/12/17 19:00:12 swdev Exp $".
+# End of "$Id: Makefile,v 1.47 2003/03/05 20:42:28 mike Exp $".
 #

diff --git a/scheduler/conf.c b/scheduler/conf.c
index b1acedebf9d516d9ce00b7c63866fdf0ec46554b..bae73a1b169d87797891c54f128f5acbbfa42133 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.124 2003/02/05 21:10:15 mike Exp $"
+ * "$Id: conf.c,v 1.125 2003/03/05 20:42:28 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -468,10 +468,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);
 
@@ -493,7 +493,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);
@@ -506,11 +506,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);
@@ -2049,5 +2057,5 @@ CDSAGetServerCerts(void)
 
 
 /*
- * End of "$Id: conf.c,v 1.124 2003/02/05 21:10:15 mike Exp $".
+ * End of "$Id: conf.c,v 1.125 2003/03/05 20:42:28 mike Exp $".
  */