commit - 9d20397470e579e603897dc4e3a80538e278491f
commit + 0e4e22a7a671d1e8efbc44bffd80062191f75c38
blob - c82ac2bf1fbf57814a69ce13d3076e30100854b5
blob + fc12cd9ba826ed19903120433464b6d148a59f3d
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -1168,11 +1168,10 @@ Handle_Channelname(struct Conf_Channel *new_chan, cons
 	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.
 	 */
-	if (*name && *name != '#') {
+	if (*name && *name != '#' && *name != '&') {
 		*dest = '#';
 		--size;
 		++dest;