[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/03/14 08:50:52

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

Log message:
        patch #6462

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1365&r2=1.1366
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonFile.ml?cvsroot=mldonkey&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.246&r2=1.247

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1365
retrieving revision 1.1366
diff -u -b -r1.1365 -r1.1366
--- distrib/ChangeLog   11 Mar 2008 11:01:01 -0000      1.1365
+++ distrib/ChangeLog   14 Mar 2008 08:50:51 -0000      1.1366
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/03/14
+6462: Multiuser: Restrict chown to admin users only
+
 2008/03/11
 6458: Fix commit bug when filesystem reports negative values
       for maximum filename length

Index: src/daemon/common/commonFile.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonFile.ml,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- src/daemon/common/commonFile.ml     3 Aug 2007 22:14:18 -0000       1.77
+++ src/daemon/common/commonFile.ml     14 Mar 2008 08:50:52 -0000      1.78
@@ -714,7 +714,7 @@
         ("", "sr", Printf.sprintf "%d" (file_priority file)) ];
 
       Printf.bprintf buf "\\</tr\\>\\<tr class=\\\"dl-%d\\\"\\>" 
(html_mods_cntr ());
-      if user2_allow_file_admin file o.conn_user.ui_user then
+      if user2_is_admin o.conn_user.ui_user then
         let optionlist = ref "" in
         user2_users_iter (fun user ->
          if user <> (file_owner file) then

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- src/daemon/driver/driverCommands.ml 4 Feb 2008 23:58:22 -0000       1.246
+++ src/daemon/driver/driverCommands.ml 14 Mar 2008 08:50:52 -0000      1.247
@@ -3782,7 +3782,7 @@
            begin
              try
                let u = user2_user_find user in
-               if user2_allow_file_admin file o.conn_user.ui_user then
+               if user2_is_admin o.conn_user.ui_user then
                  begin
                    set_file_owner file u;
                     match file_group file with