[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:00:04

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

Log message:
        patch #5607

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

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -b -r1.1124 -r1.1125
--- distrib/ChangeLog   2 Dec 2006 12:35:45 -0000       1.1124
+++ distrib/ChangeLog   2 Dec 2006 16:00:04 -0000       1.1125
@@ -15,6 +15,8 @@
 =========
 
 2006/12/02
+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
 - new columns for session up-/download
 - send session values to GUIs

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -b -r1.205 -r1.206
--- src/daemon/driver/driverCommands.ml 2 Dec 2006 12:35:45 -0000       1.205
+++ src/daemon/driver/driverCommands.ml 2 Dec 2006 16:00:04 -0000       1.206
@@ -3422,7 +3422,19 @@
                if user2_allow_file_admin file o.conn_user.ui_user then
                  begin
                    set_file_owner file u;
+                    match file_group file with
+                    | None ->
                    print_command_result o o.conn_buf (Printf.sprintf (_b 
"Changed owner of download %d to %s") num user)
+                    | Some g ->
+                        if List.mem g u.user_groups then
+                          print_command_result o o.conn_buf (Printf.sprintf 
(_b "Changed owner of download %d to %s") num user)
+                        else
+                          begin
+                            set_file_group file u.user_default_group;
+                            print_command_result o o.conn_buf (Printf.sprintf
+                              (_b "owner %s is not member of file_group %s, 
changing file_group to user_default_group %s")
+                              user g.group_name 
(user2_print_user_default_group u))
+                          end
                  end
                else              
                  print_command_result o o.conn_buf (Printf.sprintf (_b "You 
are not allowed to change owner of download %d to %s") num user)