From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 7 Jun 2001 06:45:02 +0000 (+0000)
Subject: 	updates
X-Git-Tag: robodoc-323~212
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=13711780d06dab51312f2585e3d53876816f3173;p=silc.git

	updates
---

diff --git a/CHANGES b/CHANGES
index 54b3bed0..94e8cae0 100644
--- 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 0a7234c4..c11963da 100644
--- 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 a6924752..070f6cb9 100644
--- 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 ed3e3855..583d0221 100644
--- 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 9f5dc781..86341b8d 100644
--- 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