[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/03 21:01:43

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInterface.ml 

Log message:
        patch #4863

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.707&tr2=1.708&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml.diff?tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.707 mldonkey/distrib/ChangeLog:1.708
--- mldonkey/distrib/ChangeLog:1.707    Fri Feb  3 21:00:47 2006
+++ mldonkey/distrib/ChangeLog  Fri Feb  3 21:01:43 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/03
+4863: GUI: Prevent kill by users other than admin
 4862: EDK: Fix broken import of eMule temp Files (import_temp) (schlumpf)
 4860: Multiuser: print warning if admin password is empty
 - user admin is re-created if deleted, it has to be present in any case because
Index: mldonkey/src/daemon/driver/driverInterface.ml
diff -u mldonkey/src/daemon/driver/driverInterface.ml:1.38 
mldonkey/src/daemon/driver/driverInterface.ml:1.39
--- mldonkey/src/daemon/driver/driverInterface.ml:1.38  Fri Feb  3 03:12:14 2006
+++ mldonkey/src/daemon/driver/driverInterface.ml       Fri Feb  3 21:01:43 2006
@@ -673,7 +673,18 @@
                     network_extend_search r s e)
           
           | P.KillServer -> 
-              CommonInteractive.clean_exit 0
+             if gui.gui_conn.conn_user == default_user then
+               CommonInteractive.clean_exit 0
+             else
+               begin
+                  let o = gui.gui_conn in
+                  let buf = o.conn_buf in
+                  Buffer.reset buf; 
+                  Buffer.add_string buf "\nOnly 'admin' is allowed to kill 
MLDonkey\n";
+                  gui_send gui (P.Console (
+                      DriverControlers.dollar_escape o false
+                        (Buffer.contents buf)))
+               end
           
           | P.Search_query s ->