[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2010-07-31 8:04:45
Message-ID: 20100731080445.75BB7AC7E8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1157485 by ossi:

remove the ResetSignal and TermSignal options

they *may* have made sense in 1987, but i've yet to see an x server
which uses different signals today.

 M  +4 -0      ChangeLog  
 M  +2 -2      backend/client.c  
 M  +1 -1      backend/ctrl.c  
 M  +4 -4      backend/dm.c  
 M  +2 -2      backend/server.c  
 M  +0 -24     config.def  


--- trunk/KDE/kdebase/workspace/kdm/ChangeLog #1157484:1157485
@@ -2,6 +2,10 @@
 startup and packaging. Bug fixes are not listed, and feature changes only
 if they affect the configuration.
 
+2010-06-06  Oswald Buddenhagen <ossi@kde.org>
+
+	* Removed the ResetSignal and TermSignal options.
+
 2010-02-28  Oswald Buddenhagen <ossi@kde.org>
 
 	* Made it possible to run X server and greeter as non-root.
--- trunk/KDE/kdebase/workspace/kdm/backend/client.c #1157484:1157485
@@ -1966,8 +1966,8 @@
 
     /* make sure the server gets reset after the session is over */
     if (td->serverPid >= 2) {
-        if (!td->terminateServer && td->resetSignal)
-            terminateProcess(td->serverPid, td->resetSignal);
+        if (!td->terminateServer)
+            terminateProcess(td->serverPid, SIGHUP);
     } else {
         resetServer(td);
     }
--- trunk/KDE/kdebase/workspace/kdm/backend/ctrl.c #1157484:1157485
@@ -853,7 +853,7 @@
                     break;
                 case remoteLogin:
                     if (di->serverPid != -1 && nuke)
-                        terminateProcess(di->serverPid, di->termSignal);
+                        terminateProcess(di->serverPid, SIGTERM);
                     break;
                 case reserve:
                     di->status = notRunning;
--- trunk/KDE/kdebase/workspace/kdm/backend/dm.c #1157484:1157485
@@ -1422,8 +1422,8 @@
              * servers which read auth file only on reset instead of
              * at first connection)
              */
-            if (d->serverPid != -1 && d->resetForAuth && d->resetSignal)
-                kill(d->serverPid, d->resetSignal);
+            if (d->serverPid != -1 && d->resetForAuth)
+                kill(d->serverPid, SIGHUP);
         }
         if (d->serverPid == -1) {
             d->serverStatus = awaiting;
@@ -1503,7 +1503,7 @@
         if (d->pid != -1)
             terminateProcess(d->pid, SIGTERM);
         if (d->serverPid != -1)
-            terminateProcess(d->serverPid, d->termSignal);
+            terminateProcess(d->serverPid, SIGTERM);
         d->status = zombie;
         d->zstatus = endState & DS_MASK;
         debug(" zombiefied\n");
@@ -1591,7 +1591,7 @@
                 (serverCmd != XS_KEEP || d->terminateServer))
             {
                 debug("killing X server for %s\n", d->name);
-                terminateProcess(d->serverPid, d->termSignal);
+                terminateProcess(d->serverPid, SIGTERM);
                 d->status = phoenix;
             } else {
                 d->status = notRunning;
--- trunk/KDE/kdebase/workspace/kdm/backend/server.c #1157484:1157485
@@ -168,8 +168,8 @@
         break; /* cannot happen */
     case starting:
         logError("X server startup timeout, terminating\n");
-        kill(d->serverPid, d->termSignal);
-        d->serverStatus = d->termSignal == SIGKILL ? killed : terminated;
+        kill(d->serverPid, SIGTERM);
+        d->serverStatus = terminated;
         serverTimeout = d->serverTimeout + now;
         break;
     case terminated:
--- trunk/KDE/kdebase/workspace/kdm/config.def #1157484:1157485
@@ -1483,30 +1483,6 @@
  of resetting it. Use this if the &X-Server; leaks memory or crashes the system
  on reset attempts.
 
-Key: ResetSignal
-Type: int
-Default: 1
-CDefault: 1 (SIGHUP)
-User: core
-Instance: #:*/
-Merge: xdm
-Comment:
- The signal needed to reset the local &X-Server;.
-Description:
- The signal number to use to reset the local &X-Server;.
-
-Key: TermSignal
-Type: int
-Default: 15
-CDefault: 15 (SIGTERM)
-User: core
-Instance: #:*/
-Merge: xdm
-Comment:
- The signal needed to terminate the local &X-Server;.
-Description:
- The signal number to use to terminate the local &X-Server;.
-
 Key: Authorize
 Type: bool
 Default: true
[prev in list] [next in list] [prev in thread] [next in thread]