[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-121-g8427719

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  8427719da42f7c0df0dc56755f386f4c6cf829f8 (commit)
       via  8f4aec8a9cac850c6f73e302e7348441f4a7a53a (commit)
       via  ed6e880a334fd335e730f4ab7e951a1901481c5f (commit)
      from  b368198005d87e6ddd045943afa34eaa1f1b5130 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 8427719da42f7c0df0dc56755f386f4c6cf829f8
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Apr 9 18:33:22 2010 +0200

    Use gnulib::snprintf instead of snprintf

diff --git a/myserver/src/base/base64/mime_utils.cpp 
b/myserver/src/base/base64/mime_utils.cpp
index 3348ee9..d42f232 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -489,7 +489,7 @@ char* CQPUtils::encode (char *input)
       }
       finalresult = expandBuffer (finalresult, UsedSize, &BufSize, 0);
 
-      snprintf (mids, 3, "%X", mid);
+      gnulib::snprintf (mids, 3, "%X", mid);
 
       myserver_strupr (mids);
       *(fresult++) = '=';
diff --git a/myserver/src/base/crypt/crypt_algo_manager.cpp 
b/myserver/src/base/crypt/crypt_algo_manager.cpp
index 1c561ab..1f0d447 100644
--- a/myserver/src/base/crypt/crypt_algo_manager.cpp
+++ b/myserver/src/base/crypt/crypt_algo_manager.cpp
@@ -106,7 +106,7 @@ CryptAlgoManager::check (const char *value, size_t 
valueLen, const char *result,
   CryptAlgo *f = make (algo);
   if (!f)
     {
-      snprintf (buffer, bufferLen, _("%s is not a registered algorithm"), 
algo);
+      gnulib::snprintf (buffer, bufferLen, _("%s is not a registered 
algorithm"), algo);
       throw CryptAlgoManagerException (buffer);
     }
   auto_ptr<CryptAlgo> keeper (f);
diff --git a/myserver/src/base/socket/socket.cpp 
b/myserver/src/base/socket/socket.cpp
index 738c1b7..f2bab81 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -409,7 +409,7 @@ int Socket::connect (const char* host, u_short port)
     }
 
   memset (szPort, 0, sizeof (char)*10);
-  snprintf (szPort, 10, "%d", port);
+  gnulib::snprintf (szPort, 10, "%d", port);
 
   if (aiHints.ai_family != 0)
     nGetaddrinfoRet = getaddrinfo (host, NULL, &aiHints, &pHostInfo);
diff --git a/myserver/src/protocol/control/control_protocol.cpp 
b/myserver/src/protocol/control/control_protocol.cpp
index 957fd34..8a13616 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -541,7 +541,7 @@ int ControlProtocol::addToLog (int retCode, ConnectionPtr 
con, char *buffer,
 {
   string time;
   getRFC822GMTTime (time, 32);
-  snprintf (buffer, bufferSize, "%s [%s] %s:%s:%s - %s - %i", con->getIpAddr 
(),
+  gnulib::snprintf (buffer, bufferSize, "%s [%s] %s:%s:%s - %s - %i", 
con->getIpAddr (),
             time.c_str (), header.getCommand (), header.getVersion (),
             header.getOptions (), header.getAuthLogin (), retCode);
   con->host->accessesLogWrite ("%s", buffer);
@@ -565,14 +565,14 @@ int ControlProtocol::sendResponse (char *buffer, int 
buffersize,
     dataLength = outFile->getFileSize ();
 
   /* Build and send the first line.  */
-  snprintf (buffer, buffersize, "/%i\r\n", errID);
+  gnulib::snprintf (buffer, buffersize, "/%i\r\n", errID);
   if (a->socket->send (buffer, strlen (buffer), 0) < 0)
     {
       a->host->warningsLogWrite (_("Control: socket error"));
       return -1;
     }
 
-  snprintf (buffer, buffersize, "/LEN %u\r\n", (u_int)dataLength);
+  gnulib::snprintf (buffer, buffersize, "/LEN %u\r\n", (u_int)dataLength);
   if (a->socket->send (buffer, strlen (buffer), 0) < 0)
     {
       a->host->warningsLogWrite (_("Control: socket error"));
@@ -669,7 +669,7 @@ int ControlProtocol::visitConnection (ConnectionPtr con, 
void *argP)
 
   if (arg->command == ControlProtocolVisitorArg::SHOW_CONNECTIONS)
   {
-    snprintf (arg->buffer, arg->bufferSize, "%i - %s - %i - %s - %i - %s - 
%s\r\n",
+    gnulib::snprintf (arg->buffer, arg->bufferSize, "%i - %s - %i - %s - %i - 
%s - %s\r\n",
               static_cast<int>(con->getID ()),  con->getIpAddr (),
               static_cast<int>(con->getPort ()),
               con->getLocalIpAddr (),  static_cast<int>(con->getLocalPort ()),



commit 8f4aec8a9cac850c6f73e302e7348441f4a7a53a
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Apr 9 18:20:32 2010 +0200

    Copy mscgi files only when they exist.

diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am 
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 1cdce5d..b03fb68 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -26,7 +26,8 @@ SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e 
'/^shrext_cmds/ !d; s/^.*="\
 all: all-am math_sum.mscgi
 
 math_sum.mscgi: libmath_sum.la
-       cp .libs/libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
+       test -e .libs/libmath_sum$(SO_EXT) \
+       || cp .libs/libmath_sum$(SO_EXT) ../../cgi-bin/math_sum.mscgi
 
 clean-local:
        test \! -e libmath_sum.la || \
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am 
b/myserver/binaries/web/cgi-src/post/Makefile.am
index a793681..fe058b5 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -26,7 +26,8 @@ SO_EXT=`$(LIBTOOL) --config | $(SED) -e"y/'/\"/" -e 
'/^shrext_cmds/ !d; s/^.*="\
 all: all-am post.mscgi
 
 post.mscgi: libpost.la
-       cp .libs/libpost$(SO_EXT) ../../cgi-bin/post.mscgi
+       test -e .libs/libpost$(SO_EXT)
+       || cp .libs/libpost$(SO_EXT) ../../cgi-bin/post.mscgi
 
 clean-local:
        test \! -e libpost.la || \



commit ed6e880a334fd335e730f4ab7e951a1901481c5f
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Apr 9 18:12:35 2010 +0200

    By default disable the xml2 test at configure time

diff --git a/myserver/configure.ac b/myserver/configure.ac
index 1f69c19..dbab106 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -199,6 +199,7 @@ if test "x$IDN_LIB" = "x"; then
 
 AC_SUBST(IDN_LIB)
 
+enable_xmltest=no
 dnl Looking for LibXL2
 AM_PATH_XML2(2.6.0, have_xml2=yes)
 if test x$have_xml2 != xyes; then

-----------------------------------------------------------------------

Summary of changes:
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    3 ++-
 myserver/binaries/web/cgi-src/post/Makefile.am     |    3 ++-
 myserver/configure.ac                              |    1 +
 myserver/src/base/base64/mime_utils.cpp            |    2 +-
 myserver/src/base/crypt/crypt_algo_manager.cpp     |    2 +-
 myserver/src/base/socket/socket.cpp                |    2 +-
 myserver/src/protocol/control/control_protocol.cpp |    8 ++++----
 7 files changed, 12 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU MyServer