Load cups into easysw/current.

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

diff --git a/scheduler/main.c b/scheduler/main.c
index 018fba69afb83e2dcfe4d4d9c245f0aad7bf87e5..b0b581cdec8980676b126e0cf67eac709a3de541 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 5157 2006-02-23 20:58:57Z mike $"
+ * "$Id: main.c 5216 2006-03-02 17:47:53Z mike $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -428,11 +428,7 @@ main(int  argc,                            /* I - Number of command-line args */
   */
 
 #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  if (RunAsUser)
-    sigset(SIGHUP, sigterm_handler);
-  else
-    sigset(SIGHUP, sighup_handler);
-
+  sigset(SIGHUP, sighup_handler);
   sigset(SIGPIPE, SIG_IGN);
   sigset(SIGTERM, sigterm_handler);
 #elif defined(HAVE_SIGACTION)
@@ -440,12 +436,7 @@ main(int  argc,                            /* I - Number of command-line args */
 
   sigemptyset(&action.sa_mask);
   sigaddset(&action.sa_mask, SIGHUP);
-
-  if (RunAsUser)
-    action.sa_handler = sigterm_handler;
-  else
-    action.sa_handler = sighup_handler;
-
+  action.sa_handler = sighup_handler;
   sigaction(SIGHUP, &action, NULL);
 
   sigemptyset(&action.sa_mask);
@@ -458,11 +449,7 @@ main(int  argc,                            /* I - Number of command-line args */
   action.sa_handler = sigterm_handler;
   sigaction(SIGTERM, &action, NULL);
 #else
-  if (RunAsUser)
-    signal(SIGHUP, sigterm_handler);
-  else
-    signal(SIGHUP, sighup_handler);
-
+  signal(SIGHUP, sighup_handler);
   signal(SIGPIPE, SIG_IGN);
   signal(SIGTERM, sigterm_handler);
 #endif /* HAVE_SIGSET */
@@ -520,18 +507,6 @@ main(int  argc,                            /* I - Number of command-line args */
 
   cupsdStartSystemMonitor();
 
- /*
-  * If the administrator has configured the server to run as an unpriviledged
-  * user, change to that user now...
-  */
-
-  if (RunAsUser)
-  {
-    setgid(Group);
-    setgroups(1, &Group);
-    setuid(User);
-  }
-
  /*
   * Catch signals...
   */
@@ -2338,5 +2313,5 @@ usage(int status)                 /* O - Exit status */
 
 
 /*
- * End of "$Id: main.c 5157 2006-02-23 20:58:57Z mike $".
+ * End of "$Id: main.c 5216 2006-03-02 17:47:53Z mike $".
  */