[myserver-commit] [2979] Fixed messages.

[Giuseppe Scrivano]

Revision: 2979
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2979
Author:   gscrivano
Date:     2008-12-10 21:25:14 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
Fixed messages.

Modified Paths:
--------------
    trunk/myserver/binaries/certificates/how_create_certificates.txt
    trunk/myserver/src/connections_scheduler/listen_threads.cpp

Modified: trunk/myserver/binaries/certificates/how_create_certificates.txt
===================================================================
--- trunk/myserver/binaries/certificates/how_create_certificates.txt    
2008-12-08 21:03:25 UTC (rev 2978)
+++ trunk/myserver/binaries/certificates/how_create_certificates.txt    
2008-12-10 21:25:14 UTC (rev 2979)
@@ -2,13 +2,13 @@
 provided by GNU TLS.
 Look here for more information: http://www.gnu.org/software/gnutls/.
 
-certtool --generate-privkey --outfile server.key
-certtool --generate-self-signed --load-privkey server.key --outfile server.pem
+certtool --generate-privkey --outfile cert.key
+certtool --generate-self-signed --load-privkey privkey.key --outfile cert.pem
 
 These commands will create two files server.key and server.pem. Put
 them in this directory and configure your virtual host file to use these
 files adding the following lines under the <VHOST> section:
 
-<SSL_PRIVATEKEY>certificates/server.key</SSL_PRIVATEKEY>
-<SSL_CERTIFICATE>certificates/server.pem</SSL_CERTIFICATE>
+<SSL_PRIVATEKEY>certificates/cert.key</SSL_PRIVATEKEY>
+<SSL_CERTIFICATE>certificates/privkey.pem</SSL_CERTIFICATE>
 <SSL_PASSWORD></SSL_PASSWORD>

Modified: trunk/myserver/src/connections_scheduler/listen_threads.cpp
===================================================================
--- trunk/myserver/src/connections_scheduler/listen_threads.cpp 2008-12-08 
21:03:25 UTC (rev 2978)
+++ trunk/myserver/src/connections_scheduler/listen_threads.cpp 2008-12-10 
21:25:14 UTC (rev 2979)
@@ -155,7 +155,7 @@
       serverSocketIPv6->socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
       if ( serverSocketIPv6->getHandle() == (FileHandle)INVALID_SOCKET )
       {
-        server->logWriteln(languageParser->getValue("ERR_OPENP"), 
MYSERVER_ERROR);
+        server->logWriteln(languageParser->getValue("ERR_OPENP"), 
MYSERVER_LOG_MSG_ERROR);
         delete serverSocketIPv6;
         serverSocketIPv6 = NULL;
       }
@@ -177,7 +177,7 @@
                                         (const char *)&optvalReuseAddr,
                                         sizeof(optvalReuseAddr))<0)
         {
-          server->logWriteln(languageParser->getValue("ERR_ERROR"), 
MYSERVER_ERROR);
+          server->logWriteln(languageParser->getValue("ERR_ERROR"), 
MYSERVER_LOG_MSG_ERROR);
           delete serverSocketIPv6;
           serverSocketIPv6 = NULL;
           //return 0;allow IPv6
@@ -187,7 +187,7 @@
                                         (const char *)&optvalReuseAddr,
                                         sizeof(optvalReuseAddr)) < 0)
         {
-          server->logWriteln(languageParser->getValue("ERR_ERROR"), 
MYSERVER_ERROR);
+          server->logWriteln(languageParser->getValue("ERR_ERROR"), 
MYSERVER_LOG_MSG_ERROR);
           delete serverSocketIPv6;
           serverSocketIPv6 = NULL;
           //return 0;allow IPv6
@@ -203,7 +203,7 @@
           if ( serverSocketIPv6->bind(&sockServerSocketIPv6,
                                       sizeof(sockaddr_in6)) != 0)
           {
-            server->logWriteln(languageParser->getValue("ERR_BIND"), 
MYSERVER_ERROR);
+            server->logWriteln(languageParser->getValue("ERR_BIND"), 
MYSERVER_LOG_MSG_ERROR);
             delete serverSocketIPv6;
             serverSocketIPv6 = NULL;
           }