Automated merge with ssh://hg.atheme.org//hg/charybdis

include/numeric.h

@@ -154,6 +154,8 @@ extern const char *form_str(int);
 #define RPL_LISTEND          323
 #define RPL_CHANNELMODEIS    324
 
+#define RPL_CHANNELURL       328 /* to be sent by services */
+
 #define RPL_CREATIONTIME     329
 #define RPL_WHOISLOGGEDIN    330
 

include/s_conf.h

@@ -134,7 +134,6 @@ struct config_file_entry
 	const char *xlinefile;
 	const char *resvfile;
 
-	char *servlink_path;
 	char *egdpool_path;
 
 	char *default_operstring;

src/messages.tab

@@ -349,7 +349,7 @@ static  const char *  replies[] = {
 /* 325 */       NULL,
 /* 326 */       NULL,
 /* 327 */       NULL,
-/* 328 */       NULL,
+/* 328 RPL_CHANNELURL */	NULL,
 /* 329 RPL_CREATIONTIME, */	":%s 329 %s %s %lu", 
 /* 330 RPL_WHOISLOGGEDIN */	":%s 330 %s %s %s :is logged in as",
 /* 331 RPL_NOTOPIC, */          ":%s 331 %s %s :No topic is set.",