updated

diff --git a/CHANGES b/CHANGES
index 2ad64b42cc15058eeed2a6cb5163bb3163f5ad89..e99ec8c4609bcbc4e60db213fa289039c4c8a8c5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Thu Mar 14 13:38:12 EET 2002  Timo Sirainen <tss@iki.fi>
+
+       * $usermode, $cumode and $cumode_space expandos shouldn't do
+         anything with non-SILC server records. Affected file
+         irssi/src/silc/core/silc-expandos.c
+
 Wed Mar 13 21:38:26 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed the silc_net_check_[host/local]_by_sock to support

diff --git a/apps/irssi/src/silc/core/silc-expandos.c b/apps/irssi/src/silc/core/silc-expandos.c
index 3bffb9e63fb80c16e7ceeb55a93bef0355b64578..d29a31d4f2262b56810388c6631ca9014eb82b7c 100644 (file)
--- a/apps/irssi/src/silc/core/silc-expandos.c
+++ b/apps/irssi/src/silc/core/silc-expandos.c
@@ -47,7 +47,7 @@ static char *expando_usermode(SERVER_REC *server, void *item, int *free_ret)
 
 static char *expando_cumode(SERVER_REC *server, void *item, int *free_ret)
 {
-  if (IS_CHANNEL(item) && CHANNEL(item)->ownnick) {
+  if (IS_SILC_CHANNEL(item) && CHANNEL(item)->ownnick) {
     SILC_NICK_REC *nick = (SILC_NICK_REC *)CHANNEL(item)->ownnick;
     return (nick->op && nick->founder) ? "*@" :
       nick->op ? "@" : nick->founder ? "*" : "";
@@ -59,7 +59,12 @@ static char *expando_cumode(SERVER_REC *server, void *item, int *free_ret)
 static char *expando_cumode_space(SERVER_REC *server, void *item, 
                                  int *free_ret)
 {
-  char *ret = expando_cumode(server, item, free_ret);
+  char *ret;
+
+  if (!IS_SILC_SERVER(server))
+    return "";
+
+  ret = expando_cumode(server, item, free_ret);
   return *ret == '\0' ? " " : ret;
 }