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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/01/24 14:43:38

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

Log message:
        patch #6381

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1349&r2=1.1350
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.242&r2=1.243

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1349
retrieving revision 1.1350
diff -u -b -r1.1349 -r1.1350
--- distrib/ChangeLog   19 Jan 2008 14:37:04 -0000      1.1349
+++ distrib/ChangeLog   24 Jan 2008 14:43:37 -0000      1.1350
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/01/24
+6381: Multiuser: Block commands "shares" and "share" for non-admin users
+-------------------------------------------------------------------------------
 2008/01/16: version 2.9.3 = tag release-2-9-3
 6379: bwstats: Show downloaded bytes (pango)
 

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -b -r1.242 -r1.243
--- src/daemon/driver/driverCommands.ml 3 Aug 2007 22:12:57 -0000       1.242
+++ src/daemon/driver/driverCommands.ml 24 Jan 2008 14:43:38 -0000      1.243
@@ -2450,7 +2450,7 @@
      ), "debug command";
 
     "shares", Arg_none (fun o ->
-
+       if user2_is_admin o.conn_user.ui_user then begin
         let buf = o.conn_buf in
 
         if use_html_mods o then begin
@@ -2559,9 +2559,13 @@
 
           end;
         ""
+         end
+        else
+         _s "You are not allowed to list shared directories"
     ), ":\t\t\t\tprint shared directories";
 
     "share", Arg_multiple (fun args o ->
+       if user2_is_admin o.conn_user.ui_user then begin
         let (prio, arg, strategy) = match args with
           | [prio; arg; strategy] -> int_of_string prio, arg, strategy
           | [prio; arg] -> int_of_string prio, arg, "only_directory"
@@ -2595,6 +2599,9 @@
          end
         else
           "no such directory"
+         end
+        else
+         _s "You are not allowed to share directories"
     ), "<priority> <dir> [<strategy>] :\tshare directory <dir> with <priority> 
[and sharing strategy <strategy>]";
 
     "unshare", Arg_one (fun arg o ->