Allow pre-defined server local channels ("&").

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index c82ac2bf1fbf57814a69ce13d3076e30100854b5..fc12cd9ba826ed19903120433464b6d148a59f3d 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
 /*
  * ngIRCd -- The Next Generation IRC Daemon

- * Copyright (c)2001,2002 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -1168,11 +1168,10 @@ Handle_Channelname(struct Conf_Channel *new_chan, const char *name)
        size_t size = sizeof(new_chan->name);
        char *dest = new_chan->name;
 
        size_t size = sizeof(new_chan->name);
        char *dest = new_chan->name;
 

-       /*
-        * channels must begin with &, +, or '#', if it is
+       /* Channels names must begin with "&" or "#", if it is

         * missing, add a '#'. This is only here for user convenience.
         */
         * missing, add a '#'. This is only here for user convenience.
         */

-       if (*name && *name != '#') {
+       if (*name && *name != '#' && *name != '&') {

                *dest = '#';
                --size;
                ++dest;
                *dest = '#';
                --size;
                ++dest;