[Pkg-silc-commits] [SCM] terminal based SILC client branch, master, updated. debian/1.1.7-2

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 81483d87b5e247a6655202ad53da2372b8b46a9a
Author: Stefan Vetsch <stefan at tuners.ch>
Date:   Wed Jul 7 18:01:45 2010 +0200

    Fix plugin compatibility with irssi 0.8.15
    
    Add function to replace the behaviour of server_setup_find_port which was
    removed from irssi on revision 5125 [1].
    
    [1] http://svn.irssi.org/cgi-bin/viewvc.cgi/irssi/trunk/src/core/servers-setup.c?root=irssi&r1=4814&r2=5125
    
    (Closes: #577501)

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index cfefe32..21d0ad4 100644
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -2790,6 +2790,15 @@ static void silc_get_auth_ask_passphrase(const unsigned char *passphrase,
   silc_free(a);
 }
 
+/* helper function to emulate server_setup_find_port */
+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
+						     int port) {
+  SERVER_SETUP_REC *rec;
+
+  rec = server_setup_find(address, port, NULL);
+  return (rec == NULL || rec->port != port) ? NULL : rec;
+}
+
 /* Find authentication data by hostname and port. The hostname may be IP
    address as well.*/
 
@@ -2811,7 +2820,7 @@ void silc_get_auth_method(SilcClient client, SilcClientConnection conn,
 
   /* Check whether we find the password for this server in our
      configuration.  If it's set, always send it server. */
-  setup = server_setup_find_port(hostname, port);
+  setup = silc_server_setup_find_port(hostname, port);
   if (setup && setup->password) {
     completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
 	       context);

-- 
terminal based SILC client