- Besseres Logging, wenn malloc() fehl schlaegt.

- Ban- und Invite-Lists werden korrekt aufgeraeumt.

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 5e4d11be7fd9453d7fcc9cccf5be5ffe7dfe0c8b..38dc4684acef6109138b7ccda346dc6240bf5e1b 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: channel.c,v 1.27 2002/06/02 17:13:07 alex Exp $
+ * $Id: channel.c,v 1.28 2002/06/09 13:15:58 alex Exp $
  *
  * channel.c: Management der Channels
  */
@@ -36,6 +36,7 @@
 #include "resolve.h"
 #include "conf.h"
 #include "hash.h"
+#include "lists.h"
 #include "log.h"
 #include "messages.h"
 
@@ -616,7 +617,7 @@ New_Chan( CHAR *Name )
        c = malloc( sizeof( CHANNEL ));
        if( ! c )
        {
-               Log( LOG_EMERG, "Can't allocate memory!" );
+               Log( LOG_EMERG, "Can't allocate memory! [New_Chan]" );
                return NULL;
        }
        c->next = NULL;
@@ -662,7 +663,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
        cl2chan = malloc( sizeof( CL2CHAN ));
        if( ! cl2chan )
        {
-               Log( LOG_EMERG, "Can't allocate memory!" );
+               Log( LOG_EMERG, "Can't allocate memory! [Add_Client]" );
                return NULL;
        }
        cl2chan->channel = Chan;
@@ -787,6 +788,9 @@ Delete_Channel( CHANNEL *Chan )
 
        Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
 
+       /* Invite- und Ban-Lists aufraeumen */
+       Lists_DeleteChannel( chan );
+
        /* Neu verketten und freigeben */
        if( last_chan ) last_chan->next = chan->next;
        else My_Channels = chan->next;