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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/01 20:04:09

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

Log message:
        patch #4930

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.754&tr2=1.755&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInterface.ml.diff?tr1=1.40&tr2=1.41&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.754 mldonkey/distrib/ChangeLog:1.755
--- mldonkey/distrib/ChangeLog:1.754    Sun Feb 26 16:25:12 2006
+++ mldonkey/distrib/ChangeLog  Wed Mar  1 20:04:09 2006
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/03/01
+4930: giFT GUI: Authentication support (pango)
+- login with giFTcurs now has to be done like this: giFTcurs -p user:password
+
 2006/02/26
 4938: Improve MLDonkey system user database
 due to older problems with HTML interface:
Index: mldonkey/src/daemon/driver/driverInterface.ml
diff -u mldonkey/src/daemon/driver/driverInterface.ml:1.40 
mldonkey/src/daemon/driver/driverInterface.ml:1.41
--- mldonkey/src/daemon/driver/driverInterface.ml:1.40  Sun Feb 26 16:23:55 2006
+++ mldonkey/src/daemon/driver/driverInterface.ml       Wed Mar  1 20:04:09 2006
@@ -1070,8 +1070,22 @@
           | P.GetVersion ->
               gui_send gui (P.Version Autoconf.current_version)
 
-          | P.GiftAttach _ ->
-              gui_send gui (P.GiftServerAttach ("mldonkey", "1.1"))
+          | P.GiftAttach (profile, version, client) ->
+             let user, pass =
+               try
+                 let index = String.index profile ':' in
+                   String.sub profile 0 (index), 
+                   String.sub profile (index+1) (String.length profile - index 
- 1)
+               with Not_found -> profile, "" in
+               (match gui.gui_sock with
+                 | Some sock when not (valid_password user pass) ->
+                     set_lifetime sock 5.;
+                     lprintf "BAD PASSWORD\n"; 
+                     TcpBufferedSocket.close sock (Closed_for_error "Bad 
Password")
+                 | _ ->
+                     gui.gui_auth <- true;
+                     gui.gui_conn.conn_user <- find_ui_user user;
+                     gui_send gui (P.GiftServerAttach ("mldonkey", "1.1")))
           | P.GiftStats ->
               let list = ref [] in
               networks_iter (fun n ->