From: Alexander Barton <alex@barton.de>
Date: Tue, 30 Dec 2008 18:23:03 +0000 (+0100)
Subject: Allow pre-defined server local channels ("&").
X-Git-Tag: rel-14-rc1~36
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=0e4e22a7a671d1e8efbc44bffd80062191f75c38

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index c82ac2bf..fc12cd9b 100644
--- a/src/ngircd/conf.c
+++ b/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, const char *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.
 	 */
-	if (*name && *name != '#') {
+	if (*name && *name != '#' && *name != '&') {
 		*dest = '#';
 		--size;
 		++dest;