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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/09/25 21:37:14

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/daemon/driver: driverInteractive.ml 

Log message:
        patch #5423

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1026&r2=1.1027
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.178&r2=1.179
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.104&r2=1.105

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1026
retrieving revision 1.1027
diff -u -b -r1.1026 -r1.1027
--- distrib/ChangeLog   25 Sep 2006 21:35:55 -0000      1.1026
+++ distrib/ChangeLog   25 Sep 2006 21:37:14 -0000      1.1027
@@ -15,6 +15,7 @@
 =========
 
 2006/09/25
+5423: Print warning for empty admin password only if allowed_ips was altered
 5422: Command "sources": Display only downloading files
 
 2006/09/24

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- src/daemon/common/commonOptions.ml  23 Sep 2006 20:29:46 -0000      1.178
+++ src/daemon/common/commonOptions.ml  25 Sep 2006 21:37:14 -0000      1.179
@@ -333,9 +333,7 @@
 
   Options.set_string_wrappers ip_range_list_option
     (fun list ->
-      List.fold_left (fun s ip ->
-         Printf.sprintf "%s %s" (Ip.string_of_range ip) s
-      ) "" list
+      String.concat " " (List.map Ip.string_of_range (List.rev list))
   )
   (fun s ->
       let list = String2.tokens s in

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- src/daemon/driver/driverInteractive.ml      23 Sep 2006 22:26:38 -0000      
1.104
+++ src/daemon/driver/driverInteractive.ml      25 Sep 2006 21:37:14 -0000      
1.105
@@ -52,7 +52,8 @@
   let warning =
     "SECURITY WARNING: user admin has an empty password, use command: useradd 
admin password\n"
   in
-  if empty_password admin_user then
+  if empty_password admin_user && !!allowed_ips <>
+    [(Ip.range_of_string (strings_of_option allowed_ips).option_default)] then
     begin
       lprintf_n "%s" warning;
       warning