updates

diff --git a/CHANGES b/CHANGES
index 54b3bed01c3329fe2fafd5574411cd8a4ab68121..94e8cae074dc3c046185c574711f7a9d817c7ce2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+Thu Jun  7 08:57:16 CEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Close log file after open.  Affected file 
+         lib/silcutil/silclog.c.
+
+       * Check whether sock == NULL in silc_client_send_packet and return
+         if it is.  Affected file lib/silcclient/silcclient.c.
+
+       * Check rec->entry == NULL in the Irssi SILC Client before
+         sending the channel message.  Affecte file is
+         irssi/src/silc/core/silc-servers.c.
+
 Tue Jun  5 08:08:21 CEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Merged a splitted window bugfix from Irssi CVS tree.  The 

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 0a7234c42c658c96ae546b6775aa8fb26540b638..c11963da6d6fd8835b785c49cf6092169fedc2df 100644 (file)
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -656,6 +656,7 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
                                        NULL, NULL);
       silc_free(pk);
     }
+    break;
     
   case SILC_COMMAND_TOPIC:
     {

diff --git a/apps/irssi/src/silc/core/silc-servers.c b/apps/irssi/src/silc/core/silc-servers.c
index a692475281a100b8bd40f19f1a4545eef9cdbe92..070f6cb95c6549bb8bd49ba08148ca631e22f4d9 100644 (file)
--- a/apps/irssi/src/silc/core/silc-servers.c
+++ b/apps/irssi/src/silc/core/silc-servers.c
@@ -51,7 +51,7 @@ static void silc_send_channel(SILC_SERVER_REC *server,
   SILC_CHANNEL_REC *rec;
   
   rec = silc_channel_find(server, channel);
-  if (rec == NULL)
+  if (rec == NULL || rec->entry == NULL)
     return;
   
   silc_client_send_channel_message(silc_client, server->conn, rec->entry, 

diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index ed3e385552b0ad75a5f633e0db3926f079f67d63..583d0221f9216325078e1840c3d18259b0989576 100644 (file)
--- a/lib/silcclient/client.c
+++ b/lib/silcclient/client.c
@@ -1051,6 +1051,9 @@ void silc_client_packet_send(SilcClient client,
 {
   SilcPacketContext packetdata;
 
+  if (!sock)
+    return;
+
   SILC_LOG_DEBUG(("Sending packet, type %d", type));
 
   /* Get data used in the packet sending, keys and stuff */

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 9f5dc781f54569ae0dfbdb7d49a4f2a5e953aff0..86341b8df3b642408f94c3d9d67373fc64727d4a 100644 (file)
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -60,14 +60,14 @@ endif
 
 $(SIM_CIPHER_OBJS): ../silccrypt/libsilccrypt.a
        rm -rf $*.c $*.o
-       $(LN_S) $(srcdir)/../silccrypt/$*.c
+       $(LN_S) $(srcdir)/../silccrypt/$*.c $*.c
        $(COMPILE) $(SIM_CFLAGS) $*.c -o $(SIM_MODULES_DIR)/$*.sim.so
        $(LN_S) $(srcdir)/$(SIM_MODULES_DIR)/$*.sim.so $*.o
        rm -rf $*.c
 
 $(SIM_HASH_OBJS): ../silccrypt/libsilccrypt.a
        rm -rf $*.c $*.o
-       $(LN_S) $(srcdir)/../silccrypt/$*.c
+       $(LN_S) $(srcdir)/../silccrypt/$*.c $*.c
        $(COMPILE) $(SIM_CFLAGS) $*.c -o $(SIM_MODULES_DIR)/$*.sim.so
        $(LN_S) $(srcdir)/$(SIM_MODULES_DIR)/$*.sim.so $*.o
        rm -rf $*.c