[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/17 18:33:16

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonGlobals.ml commonUserDb.ml 
                           guiDecoding.ml 
        src/daemon/driver: driverCommands.ml driverControlers.ml 
                           driverInteractive.ml 

Log message:
        patch #4980

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.770&tr2=1.771&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonGlobals.ml.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonUserDb.ml.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.129&tr2=1.130&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.67&tr2=1.68&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.770 mldonkey/distrib/ChangeLog:1.771
--- mldonkey/distrib/ChangeLog:1.770    Fri Mar 17 18:11:24 2006
+++ mldonkey/distrib/ChangeLog  Fri Mar 17 18:33:16 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/03/17
+4980: Multiuser: internal admin_user variable
 4979: Fix hashing large number of files
 
 2006/03/15
Index: mldonkey/src/daemon/common/commonGlobals.ml
diff -u mldonkey/src/daemon/common/commonGlobals.ml:1.61 
mldonkey/src/daemon/common/commonGlobals.ml:1.62
--- mldonkey/src/daemon/common/commonGlobals.ml:1.61    Sun Feb 26 16:23:55 2006
+++ mldonkey/src/daemon/common/commonGlobals.ml Fri Mar 17 18:33:16 2006
@@ -476,7 +476,7 @@
 let debug_clients = ref Intset.empty
 
 let default_user = {
-    ui_user_name = "admin";
+    ui_user_name = CommonUserDb.admin_user;
     ui_user_searches = [];
     ui_last_search = None;
     ui_last_results = [];
Index: mldonkey/src/daemon/common/commonUserDb.ml
diff -u mldonkey/src/daemon/common/commonUserDb.ml:1.2 
mldonkey/src/daemon/common/commonUserDb.ml:1.3
--- mldonkey/src/daemon/common/commonUserDb.ml:1.2      Wed Mar 15 20:54:00 2006
+++ mldonkey/src/daemon/common/commonUserDb.ml  Fri Mar 17 18:33:16 2006
@@ -39,6 +39,8 @@
     user_mail : string;
   }
 
+let admin_user = "admin"
+
 let blank_password = Md4.string ""
 
 module UserOption = struct
@@ -94,7 +96,7 @@
 called 'admin', and uses an empty password. To create new users,
 login as admin in mldonkey, and use the 'useradd' command."
     (list_option UserOption.t)
-    [ { user_name = "admin";
+    [ { user_name = admin_user;
         user_pass = blank_password;
         user_mail = "" } ]
 
Index: mldonkey/src/daemon/common/guiDecoding.ml
diff -u mldonkey/src/daemon/common/guiDecoding.ml:1.52 
mldonkey/src/daemon/common/guiDecoding.ml:1.53
--- mldonkey/src/daemon/common/guiDecoding.ml:1.52      Mon Jan 16 16:05:14 2006
+++ mldonkey/src/daemon/common/guiDecoding.ml   Fri Mar 17 18:33:16 2006
@@ -995,7 +995,7 @@
     | 5
     | 52 ->
         if proto < 14 then
-           let pass,_ = get_string s 2 in Password ("admin", pass)
+           let pass,_ = get_string s 2 in Password (CommonUserDb.admin_user, 
pass)
         else
         let pass,pos = get_string s 2 in
         let login,pos = get_string s pos in
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.129 
mldonkey/src/daemon/driver/driverCommands.ml:1.130
--- mldonkey/src/daemon/driver/driverCommands.ml:1.129  Wed Mar 15 20:56:43 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Fri Mar 17 18:33:16 2006
@@ -682,7 +682,7 @@
             Printf.bprintf buf "%s" result
        in
         if o.conn_user == default_user then
-         if user = "admin" then
+         if user = admin_user then
            print_result o "User 'admin' can not be removed"
          else
            try
@@ -729,7 +729,7 @@
                 incr counter;
                 Printf.bprintf buf "\\<tr class=\\\"%s\\\"\\>"
                 (if !counter mod 2 == 0 then "dl-1" else "dl-2");
-               if user.user_name <> "admin" then Printf.bprintf buf "
+               if user.user_name <> admin_user then Printf.bprintf buf "
         \\<td title=\\\"Click to remove user\\\"
         onMouseOver=\\\"mOvr(this);\\\"
         onMouseOut=\\\"mOut(this);\\\"
Index: mldonkey/src/daemon/driver/driverControlers.ml
diff -u mldonkey/src/daemon/driver/driverControlers.ml:1.63 
mldonkey/src/daemon/driver/driverControlers.ml:1.64
--- mldonkey/src/daemon/driver/driverControlers.ml:1.63 Sun Feb 26 16:23:55 2006
+++ mldonkey/src/daemon/driver/driverControlers.ml      Fri Mar 17 18:33:16 2006
@@ -311,7 +311,7 @@
         let user, pass =
           match args with
             [] -> failwith "Usage: auth <user> <password>"
-          | [s1] -> "admin", s1
+          | [s1] -> admin_user, s1
           | user :: pass :: _ -> user, pass
         in
         if valid_password user pass then begin
@@ -577,7 +577,7 @@
           "telnet connection"
           s in
         let telnet = {
-            telnet_auth = ref (empty_password "admin");
+            telnet_auth = ref (empty_password admin_user);
             telnet_iac = false;
             telnet_wait = 0;
             telnet_buffer = Buffer.create 100;
@@ -1022,7 +1022,7 @@
   CommonInteractive.display_bw_stats := false;
   clear_page buf;
 
-  let user = if r.options.login = "" then "admin" else r.options.login in
+  let user = if r.options.login = "" then admin_user else r.options.login in
   if not (valid_password user r.options.passwd) then begin
       clear_page buf;
       need_auth r !!http_realm
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.67 
mldonkey/src/daemon/driver/driverInteractive.ml:1.68
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.67        Sun Feb 26 
16:23:55 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Fri Mar 17 18:33:16 2006
@@ -51,12 +51,12 @@
 let verify_user_admin () =
   let empty_pwd = ref false in
   begin try
-    if user2_password "admin" = Md4.string "" then
+    if user2_password admin_user = blank_password then
       empty_pwd := true
     with e ->
       lprintf_nl () "SECURITY INFO: user 'admin' has to be present, 
creating...";
       empty_pwd := true;
-      ignore (user2_add "admin" blank_password "")
+      ignore (user2_add admin_user blank_password "")
   end;
   let warning =
     "SECURITY WARNING: user admin has an empty password, use command: useradd 
admin password\n"