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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/15 20:54:00

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml commonOptions.ml 
                           commonUserDb.ml 
        src/daemon/driver: driverMain.ml 

Log message:
        patch #4967

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.766&tr2=1.767&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonUserDb.ml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.100&tr2=1.101&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.766 mldonkey/distrib/ChangeLog:1.767
--- mldonkey/distrib/ChangeLog:1.766    Thu Mar  9 12:56:59 2006
+++ mldonkey/distrib/ChangeLog  Wed Mar 15 20:54:00 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/03/15
+4967: CommonUserDb: Keep old user database updated for easy downgrades
+
 2006/03/09
 4962: BT: New command "startbt" to force the start of a torrent download (jave)
 
Index: mldonkey/src/daemon/common/commonInteractive.ml
diff -u mldonkey/src/daemon/common/commonInteractive.ml:1.64 
mldonkey/src/daemon/common/commonInteractive.ml:1.65
--- mldonkey/src/daemon/common/commonInteractive.ml:1.64        Fri Feb 17 
22:24:41 2006
+++ mldonkey/src/daemon/common/commonInteractive.ml     Wed Mar 15 20:54:00 2006
@@ -32,6 +32,7 @@
 open CommonServer
 open CommonNetwork
 open CommonOptions
+open CommonUserDb
 open CommonFile
 open CommonGlobals
 open CommonSearch
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.132 
mldonkey/src/daemon/common/commonOptions.ml:1.133
--- mldonkey/src/daemon/common/commonOptions.ml:1.132   Wed Mar  8 20:05:26 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Wed Mar 15 20:54:00 2006
@@ -257,26 +257,11 @@
 let results_ini = create_options_file "results.ini"
 let files_ini = create_options_file "files.ini"
 let friends_ini = create_options_file "friends.ini"
-let users_ini = create_options_file "users.ini"
 
 let messages_log = ref "messages.log"
 
 let servers_section = file_section servers_ini [] ""
 
-let users_section = file_section users_ini ["Users"] "User accounts on the 
core"
-
-let empty_password = Md4.string ""
-
-let users = define_option users_section ["users"]
-  "old option, kept for compatibility reasons."
-    (list_option (tuple2_option (string_option, Md4.option)))
-    []
-
-let empty_password user =
-  try
-    (List.assoc user !!users) = empty_password
-  with _ -> false
-
 let ip_list_option = list_option Ip.option
 
 let int_list_option = list_option int_option
Index: mldonkey/src/daemon/common/commonUserDb.ml
diff -u mldonkey/src/daemon/common/commonUserDb.ml:1.1 
mldonkey/src/daemon/common/commonUserDb.ml:1.2
--- mldonkey/src/daemon/common/commonUserDb.ml:1.1      Sun Feb 26 16:23:55 2006
+++ mldonkey/src/daemon/common/commonUserDb.ml  Wed Mar 15 20:54:00 2006
@@ -23,59 +23,24 @@
 open CommonTypes
 open CommonOptions
 
+(* prints a new logline with date, module and starts newline *)
+let lprintf_nl () =
+  lprintf "%s[cUd] "
+    (log_time ()); lprintf_nl2
+
+(* prints a new logline with date, module and does not start newline *)
+let lprintf_n () =
+  lprintf "%s[cUd] "
+    (log_time ()); lprintf
+
 type userdb = {
     user_name : string;
     user_pass : Md4.t;
     user_mail : string;
   }
 
-let users2 = Hashtbl.create 10
-
 let blank_password = Md4.string ""
 
-let user2_iter f =
-  Hashtbl.iter f users2
-
-let user2_add name pass mail =
-  let u = {
-      user_name = name;
-      user_pass = pass;
-      user_mail = mail
-  } in
-  Hashtbl.replace users2 name u;
-  u
-
-let user2_remove user =
-  Hashtbl.remove users2 user
-
-let user2_find user =
-  try
-    Hashtbl.find users2 user
-  with Not_found -> failwith (Printf.sprintf "User %s does not exist" user)
-
-let user2_password user =
-  try
-    let u = user2_find user in
-      u.user_pass
-  with Not_found -> failwith (Printf.sprintf "User %s does not exist" user)
-
-let user2_mail user =
-  try
-    let u = user2_find user in
-      u.user_mail
-  with Not_found -> failwith (Printf.sprintf "User %s does not exist" user)
-
-let valid_password user pass =
-  try
-    user2_password user = Md4.string pass
-  with e -> false
-
-let empty_password user =
-  try
-    let p = user2_password user in
-     p  = blank_password
-  with _ -> false
-
 module UserOption = struct
 
     let value_to_user v =
@@ -114,8 +79,16 @@
 
   end
 
+let users_ini = create_options_file "users.ini"
+
+let users_section = file_section users_ini ["Users"] "User accounts on the 
core"
 let users2_section = file_section users_ini ["Users"] "User accounts on the 
core (new format)"
 
+let users = define_option users_section ["users"]
+  "Depreciated option, kept for compatibility reasons - used by MLDonkey < 
2.7.5"
+    (list_option (tuple2_option (string_option, Md4.option)))
+    []
+
 let userlist = define_option users2_section ["users2"]
   "The users that are defined on this core. The default user is
 called 'admin', and uses an empty password. To create new users,
@@ -125,6 +98,51 @@
         user_pass = blank_password;
         user_mail = "" } ]
 
+let users2 = Hashtbl.create 10
+
+let user2_iter f =
+  Hashtbl.iter f users2
+
+let user2_add name pass mail =
+  let u = {
+      user_name = name;
+      user_pass = pass;
+      user_mail = mail
+  } in
+  Hashtbl.replace users2 name u;
+  u
+
+let user2_remove user =
+  Hashtbl.remove users2 user
+
+let user2_find user =
+  try
+    Hashtbl.find users2 user
+  with Not_found -> failwith (Printf.sprintf "User %s does not exist" user)
+
+let user2_password user =
+  try
+    let u = user2_find user in
+      u.user_pass
+  with Not_found -> failwith (Printf.sprintf "User %s does not exist" user)
+
+let user2_mail user =
+  try
+    let u = user2_find user in
+      u.user_mail
+  with Not_found -> failwith (Printf.sprintf "User %s does not exist" user)
+
+let valid_password user pass =
+  try
+    user2_password user = Md4.string pass
+  with e -> false
+
+let empty_password user =
+  try
+    let p = user2_password user in
+     p = blank_password
+  with _ -> false
+
 let _ =
   set_after_load_hook users_ini (fun _ ->
       List.iter (fun user ->
@@ -132,15 +150,17 @@
       ) !!userlist;
       userlist =:= [];
       if !!users <> [] then begin
-        lprintf_nl "[cUd] converting %d users to new format" (List.length 
!!users);
+        lprintf_nl () "converting %d users to new format" (List.length 
!!users);
         List.iter (fun (user,pass) -> ignore (user2_add user pass "")) !!users;
        users =:= []
       end
   );
   set_before_save_hook users_ini (fun _ ->
       user2_iter (fun _ user ->
-          userlist =:= (user2_find user.user_name)
-          :: !!userlist
+          userlist =:= (user2_find user.user_name) :: !!userlist;
+          users =:= (user.user_name, (user2_password user.user_name)) :: 
!!users
       )
   );
-  set_after_save_hook users_ini (fun _ -> userlist =:= [])
+  set_after_save_hook users_ini (fun _ ->
+      userlist =:= [];
+      users =:= [])
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.100 
mldonkey/src/daemon/driver/driverMain.ml:1.101
--- mldonkey/src/daemon/driver/driverMain.ml:1.100      Sun Mar  5 10:41:50 2006
+++ mldonkey/src/daemon/driver/driverMain.ml    Wed Mar 15 20:54:00 2006
@@ -28,6 +28,7 @@
 open CommonDownloads
 open CommonTypes
 open CommonOptions
+open CommonUserDb
 open CommonGlobals
 open CommonNetwork