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

List:       kde-commits
Subject:    kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-05 11:00:58
Message-ID: 20050205110058.4A8481D1CD () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

no listbootoptions on fifo.
don't misinterpret "shutdown status" on fifo.


  M +4 -2      ctrl.c   2.34


--- kdebase/kdm/backend/ctrl.c  #2.33:2.34
@@ -527,5 +527,7 @@ processCtrl( const char *string, int len
                                 goto miss;
                         sdr.force = SHUT_CANCEL;
-                        if (fd >= 0 && !strcmp( ar[1], "status" )) {
+                        if (!strcmp( ar[1], "status" )) {
+                                if (fd < 0)
+                                        goto bust;
                                 if (ar[2])
                                         goto exce;
@@ -683,5 +685,5 @@ processCtrl( const char *string, int len
                                 }
                         }
-                } else if (!strcmp( ar[0], "listbootoptions" )) {
+                } else if (fd >= 0 && !strcmp( ar[0], "listbootoptions" )) {
                         char **opts;
                         int def, cur, i, j;


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