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

List:       kde-commits
Subject:    kdelibs/kdesu
From:       Adriaan de Groot <adridg () cs ! kun ! nl>
Date:       2003-10-16 10:44:34
[Download RAW message or body]

CVS commit by adridg: 

Apply patch from 50406 and remove debugging output again.


  M +9 -9      su.cpp   1.31


--- kdelibs/kdesu/su.cpp  #1.30:1.31
@@ -90,13 +90,13 @@ int SuProcess::exec(const char *password
     }
 
-    kdDebug(900) << k_lineinfo << "Call StubProcess::exec()" << endl;
+    // kdDebug(900) << k_lineinfo << "Call StubProcess::exec()" << endl;
     if (StubProcess::exec(command, args) < 0)
     {
         return check ? SuNotFound : -1;
     }
-    kdDebug(900) << k_lineinfo << "Done StubProcess::exec()" << endl;
+    // kdDebug(900) << k_lineinfo << "Done StubProcess::exec()" << endl;
     
     SuErrors ret = (SuErrors) ConverseSU(password);
-    kdDebug(900) << k_lineinfo << "Conversation returned " << ret << endl;
+    // kdDebug(900) << k_lineinfo << "Conversation returned " << ret << endl;
 
     if (ret == error) 
@@ -110,5 +110,5 @@ int SuProcess::exec(const char *password
         if (ret == killme)
         {
-            if (kill(m_Pid, SIGTERM) < 0) ret=error;
+            if (kill(m_Pid, SIGKILL) < 0) ret=error;
             else 
             {
@@ -130,5 +130,5 @@ int SuProcess::exec(const char *password
     if (ret == notauthorized)
     {
-        kill(m_Pid, SIGTERM);
+        kill(m_Pid, SIGKILL);
         waitForChild();
         return SuIncorrectPassword;
@@ -143,5 +143,5 @@ int SuProcess::exec(const char *password
     } else if (iret == 1)
     {
-        kill(m_Pid, SIGTERM);
+        kill(m_Pid, SIGKILL);
         waitForChild();
         return SuIncorrectPassword;
@@ -169,5 +169,5 @@ int SuProcess::ConverseSU(const char *pa
     unsigned i, j;
     
-    kdDebug(900) << k_lineinfo << "ConverseSU starting." << endl;
+    // kdDebug(900) << k_lineinfo << "ConverseSU starting." << endl;
 
     QCString line;
@@ -177,5 +177,5 @@ int SuProcess::ConverseSU(const char *pa
         if (line.isNull())
             return ( state == HandleStub ? notauthorized : error);
-        kdDebug(900) << k_lineinfo << "Read line <" << line << ">" << endl;
+        // kdDebug(900) << k_lineinfo << "Read line <" << line << ">" << endl;
 
         switch (state) 


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