[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-519-g913c5f1

[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  913c5f142979047f9e4a4789772b9bfbac09a33d (commit)
       via  8fd59e7b3ccb59954193048b172de1a7366a81e3 (commit)
       via  47e55f02cb29067575e42f7052a6aa9e9de7ead5 (commit)
      from  1fb3b72ff53ea5a9fbfd0ff03fd5bd4a0fd7f9aa (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 913c5f142979047f9e4a4789772b9bfbac09a33d
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Nov 24 12:45:55 2011 +0100

    gnutls: Do not erroneously use openssl wrapper library definitions.

diff --git a/myserver/include/base/socket/ssl_socket.h 
b/myserver/include/base/socket/ssl_socket.h
index 138e381..e10df5c 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -32,8 +32,6 @@
 # include <string>
 using namespace std;
 
-# include <gnutls/openssl.h>
-
 class SslSocket : public Socket
 {
 public:
diff --git a/myserver/include/base/ssl/ssl.h b/myserver/include/base/ssl/ssl.h
index 86232ac..f54d50e 100644
--- a/myserver/include/base/ssl/ssl.h
+++ b/myserver/include/base/ssl/ssl.h
@@ -22,7 +22,7 @@
 
 # include "myserver.h"
 
-# include <gnutls/openssl.h>
+# include <gnutls/gnutls.h>
 # include <string>
 
 using namespace std;
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index eb5a8b9..97c1723 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -22,6 +22,8 @@
 #include <include/base/file/files_utility.h>
 #include <include/base/sync/mutex.h>
 
+#include <gnutls/gnutls.h>
+
 #include <string.h>
 
 #include <include/base/exceptions/checked.h>
@@ -45,7 +47,6 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 # endif
 #endif
 
-
 SslContext::SslContext ()
 {
   cred = NULL;
@@ -71,7 +72,7 @@ int SslContext::initialize ()
   gnutls_certificate_allocate_credentials (&cred);
 
   gnutls_certificate_set_x509_trust_file (cred, certificateFile.c_str (),
-                                          SSL_FILETYPE_PEM);
+                                          GNUTLS_X509_FMT_PEM);
 
   /*TODO*/
   gnutls_certificate_set_x509_crl_file (cred, "", GNUTLS_X509_FMT_PEM);
diff --git a/myserver/tests/test_ssl_socket.cpp 
b/myserver/tests/test_ssl_socket.cpp
index 3566840..c28e345 100644
--- a/myserver/tests/test_ssl_socket.cpp
+++ b/myserver/tests/test_ssl_socket.cpp
@@ -166,7 +166,7 @@ public:
     gnutls_certificate_set_dh_params (cred, dh_params);
 
     gnutls_certificate_set_x509_trust_file (cred, TESTSERVERPEM,
-                                            SSL_FILETYPE_PEM);
+                                            GNUTLS_X509_FMT_PEM);
 
     gnutls_certificate_set_x509_key_file (cred, TESTSERVERPEM,
                                           TESTSERVERKEY,



commit 8fd59e7b3ccb59954193048b172de1a7366a81e3
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Nov 24 12:44:47 2011 +0100

    Use the gnulib version for chdir.

diff --git a/myserver/src/base/process/process.cpp 
b/myserver/src/base/process/process.cpp
index 8fc58c3..da70c32 100644
--- a/myserver/src/base/process/process.cpp
+++ b/myserver/src/base/process/process.cpp
@@ -262,7 +262,7 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
       if (generateEnvString (envp, size, (char*) spi->envString))
         exit (1);
 
-      if (spi->cwd.length () && chdir (spi->cwd.c_str ()) == -1)
+      if (spi->cwd.length () && gnulib::chdir (spi->cwd.c_str ()) == -1)
         exit (1);
 
       if (spi->stdIn < 0)



commit 47e55f02cb29067575e42f7052a6aa9e9de7ead5
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Nov 24 12:44:03 2011 +0100

    bootstrap: add module chown.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index bbd3918..4185dbb 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -29,6 +29,7 @@ accept
 argp
 bind
 chdir-long
+chown
 close
 closedir
 crypto/md5

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

Summary of changes:
 myserver/bootstrap.conf                   |    1 +
 myserver/include/base/socket/ssl_socket.h |    2 --
 myserver/include/base/ssl/ssl.h           |    2 +-
 myserver/src/base/process/process.cpp     |    2 +-
 myserver/src/base/ssl/ssl.cpp             |    5 +++--
 myserver/tests/test_ssl_socket.cpp        |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU MyServer