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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/06/17 01:33:39

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

Log message:
        patch #6017

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1281&r2=1.1282
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonUserDb.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.232&r2=1.233

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -b -r1.1281 -r1.1282
--- distrib/ChangeLog   17 Jun 2007 01:28:24 -0000      1.1281
+++ distrib/ChangeLog   17 Jun 2007 01:33:38 -0000      1.1282
@@ -15,6 +15,7 @@
 =========
 
 2007/06/17
+6017: Multiuser: New optional parameters group/commit_dir for command useradd
 6020: Multiuser: Fix handling of user "admin", its user_commit_dir was not
       used when MLDonkey was not restarted between download start and commit
 6019: BT: Disable user_commit_dir for multifile torrents to fix seeding

Index: src/daemon/common/commonUserDb.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonUserDb.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/daemon/common/commonUserDb.ml   17 Jun 2007 01:28:24 -0000      1.8
+++ src/daemon/common/commonUserDb.ml   17 Jun 2007 01:33:38 -0000      1.9
@@ -269,10 +269,7 @@
                             ?(default_group = Some admin_group_name)
                             ?(mail = "") ?(commit_dir = "") ?(max_dl = 0) () =
   (* shouldn't we warn admin about already existing user ? *)
-  let groups =
-    let l = List.map user2_group_find (List.filter user2_group_exists groups) 
in
-    if l = [] then [admin_group ()] else l
-  in
+  let groups = List.map user2_group_find (List.filter user2_group_exists 
groups) in
   let default_group =
     match default_group with
       None -> None

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- src/daemon/driver/driverCommands.ml 17 Jun 2007 01:28:25 -0000      1.232
+++ src/daemon/driver/driverCommands.ml 17 Jun 2007 01:33:39 -0000      1.233
@@ -3137,7 +3137,20 @@
 let _ =
   register_commands "Driver/Users" [
 
-    "useradd", Arg_two (fun user pass o ->
+    "useradd", Arg_multiple (fun args o ->
+        let group_convert g =
+          try
+            if String.lowercase g = "none" || g = "" then None
+            else Some (user2_group_find g).group_name
+          with Not_found -> None
+        in
+        let (user, pass, group, cdir) =
+          match args with
+          | [user; pass; group; cdir] -> user, pass, (group_convert group), 
cdir
+          | [user; pass; group] -> user, pass, (group_convert group), ""
+          | [user; pass] -> user, pass, Some admin_group_name, ""
+          | _ -> failwith "wrong parameters"
+        in
        if user2_is_admin o.conn_user.ui_user
          || o.conn_user.ui_user.user_name = user then
            if user2_user_exists user then
@@ -3147,13 +3160,18 @@
              end
            else
              begin
-               user2_user_add user (Md4.string pass) ();
+              match group with
+              | None -> user2_user_add user (Md4.string pass)
+                          ~groups:[] ~default_group:None ~commit_dir:cdir ();
                print_command_result o (Printf.sprintf "User %s added" user)
+              | Some g -> user2_user_add user (Md4.string pass)
+                            ~groups:[g] ~default_group:group ~commit_dir:cdir 
();
+                          print_command_result o (Printf.sprintf "User %s 
added, group %s" user g)
              end
           else
            print_command_result o "You are not allowed to add users";
        _s ""
-    ), "<user> <passwd> :\t\tadd new mldonkey user/change user password";
+    ), "<user> <passwd> [<group>] [<commit_dir>]: add new mldonkey user/change 
user password";
 
     "userdel", Arg_one (fun user o ->
         if user <> o.conn_user.ui_user.user_name then
@@ -3398,7 +3416,7 @@
 \\<table cellspacing=0 cellpadding=0  width=100%%\\>\\<tr\\>
 \\<td class=downloaded width=100%%\\>\\</td\\>
 \\<td nowrap class=\\\"fbig pr\\\"\\>\\<a onclick=\\\"javascript: {
-                   var getdir = prompt('Input: <user> <pass>','user pass')
+                   var getdir = prompt('Input: <user> <pass>','user pass 
<group> <commit_dir>')
                    var reg = new RegExp (' ', 'gi') ;
                    var outstr = getdir.replace(reg, '+');
                    parent.fstatus.location.href='submit?q=useradd+' + outstr;
@@ -3469,7 +3487,7 @@
 \\<table cellspacing=0 cellpadding=0  width=100%%\\>\\<tr\\>
 \\<td class=downloaded width=100%%\\>\\</td\\>
 \\<td nowrap class=\\\"fbig pr\\\"\\>\\<a onclick=\\\"javascript: {
-                   var getdir = prompt('Input: <group> <admin: true|false> 
[<mail>]','group true')
+                   var getdir = prompt('Input: <group> <admin: 
true|false>','group true')
                    var reg = new RegExp (' ', 'gi') ;
                    var outstr = getdir.replace(reg, '+');
                    parent.fstatus.location.href='submit?q=groupadd+' + outstr;
@@ -4034,5 +4052,5 @@
     "debug_pictures", Arg_two (fun dir output o ->
         CommonPictures.compute_ocaml_code dir output;
         _s "done"
-    ), ":\t\t\t\tfor debugging only";
+    ), ":\t\t\tfor debugging only";
   ]