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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/12/02 16:01:13

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

Log message:
        patch #5608

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1125&r2=1.1126
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.206&r2=1.207

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1125
retrieving revision 1.1126
diff -u -b -r1.1125 -r1.1126
--- distrib/ChangeLog   2 Dec 2006 16:00:04 -0000       1.1125
+++ distrib/ChangeLog   2 Dec 2006 16:01:13 -0000       1.1126
@@ -15,6 +15,8 @@
 =========
 
 2006/12/02
+5608: Multiuser, chgrp: Prevent change of file_group to None
+      if the user is not file_owner
 5607: Multiuser, chown: Change file_group to user_default_group
       if the new user is not member of file_group
 5606: Introduce display of session transfer values

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- src/daemon/driver/driverCommands.ml 2 Dec 2006 16:00:04 -0000       1.206
+++ src/daemon/driver/driverCommands.ml 2 Dec 2006 16:01:13 -0000       1.207
@@ -3389,10 +3389,15 @@
           let file = file_find num in
          if String.lowercase group = "none" then
            begin
+              if user2_allow_file_admin file o.conn_user.ui_user then
+                begin
              set_file_group file None;
              print_command_result o o.conn_buf (Printf.sprintf (_b "Changed 
group of download %d to %s") num group)
            end
          else
+                print_command_result o o.conn_buf (Printf.sprintf (_b "You are 
not allowed to change group of download %d to %s") num group)
+           end
+         else
            begin
              try
                let g = user2_group_find group in