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

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

SVN commit 1157484 by ossi:

catch comm errors in some more places

 M  +0 -2      choose.c  
 M  +2 -0      dm.c  
 M  +5 -6      session.c  


--- trunk/KDE/kdebase/workspace/kdm/backend/choose.c #1157483:1157484
@@ -791,7 +791,6 @@
 
     for (h = hostNamedb; h; h = h->next)
         if ((int)(long)h == hid) {
-            /* XXX error handling */
             gSet(&mstrtalk);
             if ((td->displayType & d_location) == dLocal) {
                 gSendInt(D_RemoteHost);
@@ -832,7 +831,6 @@
     if (!makeSockAddrs(name, &hosts))
         return;
     gSendInt(G_Ch_Exit);
-    /* XXX error handling */
     gSet(&mstrtalk);
     if ((td->displayType & d_location) == dLocal) {
         gSendInt(D_RemoteHost);
--- trunk/KDE/kdebase/workspace/kdm/backend/dm.c #1157483:1157484
@@ -1464,6 +1464,8 @@
         waitForServer(d);
         if ((d->displayType & d_location) == dLocal) {
             gSet(&mstrtalk);
+            if (Setjmp(mstrtalk.errjmp))
+                exit(EX_UNMANAGE_DPY);
             gSendInt(D_XConnOk);
         }
         manageSession();
--- trunk/KDE/kdebase/workspace/kdm/backend/session.c #1157483:1157484
@@ -230,7 +230,7 @@
 GProc grtproc;
 GTalk grttalk;
 
-GTalk mstrtalk; /* make static; see dm.c */
+GTalk mstrtalk;
 
 int
 ctrlGreeterWait(int wreply)
@@ -242,11 +242,6 @@
     ARRAY8Ptr aptr;
 #endif
 
-    if (Setjmp(mstrtalk.errjmp)) {
-        closeGreeter(True);
-        sessionExit(EX_UNMANAGE_DPY);
-    }
-
     while (gRecvCmd(&cmd)) {
         switch (cmd) {
         case G_Ready:
@@ -579,6 +574,10 @@
 
     (void)Signal(SIGHUP, SIG_IGN);
 
+    if (Setjmp(mstrtalk.errjmp)) {
+        closeGreeter(True);
+        sessionExit(EX_UNMANAGE_DPY);
+    }
     if (Setjmp(grttalk.errjmp))
         Longjmp(abortSession, EX_RESERVER_DPY); /* EX_RETRY_ONCE */
 
[prev in list] [next in list] [prev in thread] [next in thread]