[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/21 08:23:12

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

Log message:
        patch #4929

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.744&tr2=1.745&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.65&tr2=1.66&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.744 mldonkey/distrib/ChangeLog:1.745
--- mldonkey/distrib/ChangeLog:1.744    Tue Feb 21 07:49:58 2006
+++ mldonkey/distrib/ChangeLog  Tue Feb 21 08:23:12 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/02/21
+4929: Do not print password_empty warning if enable_user_config true
 4926: Runinfo: Warn about not-working DNS resolution,
       /dev/urandom detection was not disabled if --disable-donkeysui is used
 
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.65 
mldonkey/src/daemon/driver/driverInteractive.ml:1.66
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.65        Tue Feb 21 
07:49:58 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Tue Feb 21 08:23:12 2006
@@ -65,7 +65,7 @@
     users =:= ("admin", Md4.string "") :: !!users;
     empty_password := true
   end;
-  if !empty_password then
+  if !empty_password && not !!enable_user_config then
     begin
       lprintf_n () "%s" warning;
       warning