Remove ^M on line endings.

[irc/rqf/shadowircd.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index ae387a2dd9257be104fe198b989b7e95b156c0d4..807f39977bd604aec2e73be562da024bfbf6dae2 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -782,16 +782,16 @@ conf_set_listen_port_both(void *data, int ssl)
        }
 }
 
-static void\r
-conf_set_listen_port(void *data)\r
-{\r
-       conf_set_listen_port_both(data, 0);\r
-}\r
-\r
-static void\r
-conf_set_listen_sslport(void *data)\r
-{\r
-       conf_set_listen_port_both(data, 1);\r
+static void
+conf_set_listen_port(void *data)
+{
+       conf_set_listen_port_both(data, 0);
+}
+
+static void
+conf_set_listen_sslport(void *data)
+{
+       conf_set_listen_port_both(data, 1);
 }
 
 static void
@@ -1164,12 +1164,12 @@ conf_end_connect(struct TopConf *tc)
                yy_server->flags &= ~SERVER_COMPRESSED;
        }
 #endif
-       if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))\r
-       {\r
-               conf_report_error("Ignoring compressed for connect block %s -- "\r
-                                      "ssl and compressed are mutually exclusive (OpenSSL does its own compression)", \r
-                                      yy_server->name);\r
-               yy_server->flags &= ~SERVER_COMPRESSED;\r
+       if(ServerConfCompressed(yy_server) && ServerConfSSL(yy_server))
+       {
+               conf_report_error("Ignoring compressed for connect block %s -- "
+                                      "ssl and compressed are mutually exclusive (OpenSSL does its own compression)", 
+                                      yy_server->name);
+               yy_server->flags &= ~SERVER_COMPRESSED;
        }
 
        add_server_conf(yy_server);
@@ -1914,10 +1914,10 @@ static struct ConfEntry conf_serverinfo_table[] =
        { "vhost",              CF_QSTRING, conf_set_serverinfo_vhost,  0, NULL },
        { "vhost6",             CF_QSTRING, conf_set_serverinfo_vhost6, 0, NULL },
 
-       { "ssl_private_key",    CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },\r
-       { "ssl_ca_cert",        CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },\r
-       { "ssl_cert",           CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },   \r
-       { "ssl_dh_params",      CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },\r
+       { "ssl_private_key",    CF_QSTRING, NULL, 0, &ServerInfo.ssl_private_key },
+       { "ssl_ca_cert",        CF_QSTRING, NULL, 0, &ServerInfo.ssl_ca_cert },
+       { "ssl_cert",           CF_QSTRING, NULL, 0, &ServerInfo.ssl_cert },   
+       { "ssl_dh_params",      CF_QSTRING, NULL, 0, &ServerInfo.ssl_dh_params },
        { "ssld_count",         CF_INT,     NULL, 0, &ServerInfo.ssld_count },
 
        { "default_max_clients",CF_INT,     NULL, 0, &ServerInfo.default_max_clients },