[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr... |
Date: |
Mon, 18 Jun 2007 16:17:04 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/06/18 16:17:04
Modified files:
distrib : ChangeLog
src/daemon/driver: driverCommands.ml
Log message:
patch #6024
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1284&r2=1.1285
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.234&r2=1.235
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1284
retrieving revision 1.1285
diff -u -b -r1.1284 -r1.1285
--- distrib/ChangeLog 17 Jun 2007 02:08:15 -0000 1.1284
+++ distrib/ChangeLog 18 Jun 2007 16:17:03 -0000 1.1285
@@ -14,6 +14,10 @@
ChangeLog
=========
+2007/06/18
+6024: Multiuser: New parameters for command useradd:
+ user_mail + user_max_concurrent_downloads
+
2007/06/17
6021: Remove leftovers from optional zlib support,
replace Autoconf.zlib__* with Zlib.* functions
Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- src/daemon/driver/driverCommands.ml 17 Jun 2007 01:56:29 -0000 1.234
+++ src/daemon/driver/driverCommands.ml 18 Jun 2007 16:17:03 -0000 1.235
@@ -3155,11 +3155,14 @@
else Some (user2_group_find g).group_name
with Not_found -> None
in
- let (user, pass, group, cdir) =
+ let (user, pass, group, cdir, mail, mdl) =
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, ""
+ | [user; pass; group; cdir; mail; mdl] ->
+ user, pass, (group_convert group), cdir, mail, (try
int_of_string mdl with _ -> 0)
+ | [user; pass; group; cdir; mail] -> user, pass, (group_convert
group), cdir, mail, 0
+ | [user; pass; group; cdir] -> user, pass, (group_convert group),
cdir, "", 0
+ | [user; pass; group] -> user, pass, (group_convert group), "", "", 0
+ | [user; pass] -> user, pass, Some admin_group_name, "", "", 0
| _ -> failwith "wrong parameters"
in
if user2_is_admin o.conn_user.ui_user
@@ -3173,16 +3176,16 @@
begin
match group with
| None -> user2_user_add user (Md4.string pass)
- ~groups:[] ~default_group:None ~commit_dir:cdir ();
+ ~groups:[] ~default_group:None ~commit_dir:cdir
~mail:mail ~max_dl:mdl ();
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
();
+ ~groups:[g] ~default_group:group ~commit_dir:cdir
~mail:mail ~max_dl:mdl ();
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> [<group>] [<commit_dir>]: add new mldonkey user/change
user password";
+ ), "<user> <passwd> [<group>] [<commit_dir>] [<mail>] [<max_downloads>]:
add new mldonkey user/change user password";
"userdel", Arg_one (fun user o ->
if user <> o.conn_user.ui_user.user_name then