Mirror 1.1.x changes.

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

diff --git a/scheduler/conf.c b/scheduler/conf.c
index ab1a5f1cf05a712dd24eeb864b3a5d15c4bdf5d4..b5492d349017a1493374142f5d6af514c677b29d 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c,v 1.77.2.38 2003/04/10 20:15:51 mike Exp $"
+ * "$Id: conf.c,v 1.77.2.39 2003/04/10 21:18:35 mike Exp $"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -236,7 +236,9 @@ ReadConfiguration(void)
   * Save the old root paths...
   */
 
+  old_serverroot = NULL;
   SetString(&old_serverroot, ServerRoot);
+  old_requestroot = NULL;
   SetString(&old_requestroot, RequestRoot);
 
  /*
@@ -2291,5 +2293,5 @@ CDSAGetServerCerts(void)
 
 
 /*
- * End of "$Id: conf.c,v 1.77.2.38 2003/04/10 20:15:51 mike Exp $".
+ * End of "$Id: conf.c,v 1.77.2.39 2003/04/10 21:18:35 mike Exp $".
  */