You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2016/11/02 23:02:59 UTC

[1/2] kudu git commit: Fix compile error in sasl_server.cc

Repository: kudu
Updated Branches:
  refs/heads/master de1b95929 -> 4b61a3a4f


Fix compile error in sasl_server.cc

Sailesh's recent patch and my recent patch had a semantic conflict which
didn't get caught in precommit. This patch has the trivial fix.

Change-Id: If5958981956bb23fa5f34f9ef89b88e8f07f4a81
Reviewed-on: http://gerrit.cloudera.org:8080/4920
Reviewed-by: Todd Lipcon <to...@apache.org>
Tested-by: Todd Lipcon <to...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/059d1732
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/059d1732
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/059d1732

Branch: refs/heads/master
Commit: 059d1732a5709c1c251cca80703b4a2045e880b5
Parents: de1b959
Author: Todd Lipcon <to...@apache.org>
Authored: Wed Nov 2 15:08:39 2016 -0700
Committer: Todd Lipcon <to...@apache.org>
Committed: Wed Nov 2 22:18:22 2016 +0000

----------------------------------------------------------------------
 src/kudu/rpc/sasl_server.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/059d1732/src/kudu/rpc/sasl_server.cc
----------------------------------------------------------------------
diff --git a/src/kudu/rpc/sasl_server.cc b/src/kudu/rpc/sasl_server.cc
index f830dae..11d0137 100644
--- a/src/kudu/rpc/sasl_server.cc
+++ b/src/kudu/rpc/sasl_server.cc
@@ -467,12 +467,12 @@ int SaslServer::PlainAuthCb(sasl_conn_t * /*conn*/, const char * /*user*/, const
 }
 
 Status SaslServer::PreflightCheckGSSAPI(const string& app_name) {
-  // Initialize a SaslServer with a bogus socket fd, and enable
+  // Initialize a SaslServer with a null socket, and enable
   // only GSSAPI.
   //
   // We aren't going to actually send/receive any messages, but
   // this makes it easier to reuse the initialization code.
-  SaslServer server(app_name, -1);
+  SaslServer server(app_name, nullptr);
   Status s = server.EnableGSSAPI();
   if (!s.ok()) {
     return Status::RuntimeError(s.message());


[2/2] kudu git commit: fix compile error in ssl_socket.cc on Ubuntu 16.04

Posted by ad...@apache.org.
fix compile error in ssl_socket.cc on Ubuntu 16.04

X509_check_host() is defined in x509v3.h, not x509.h.

Change-Id: I0a80c6deea2d4116e37d9b034b69ac1870838077
Reviewed-on: http://gerrit.cloudera.org:8080/4921
Reviewed-by: Todd Lipcon <to...@apache.org>
Tested-by: Kudu Jenkins


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/4b61a3a4
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/4b61a3a4
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/4b61a3a4

Branch: refs/heads/master
Commit: 4b61a3a4f2809286cc28c0b65bff3204339b3b94
Parents: 059d173
Author: Adar Dembo <ad...@cloudera.com>
Authored: Wed Nov 2 15:38:29 2016 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Wed Nov 2 23:02:17 2016 +0000

----------------------------------------------------------------------
 src/kudu/util/net/ssl_socket.cc | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/4b61a3a4/src/kudu/util/net/ssl_socket.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/net/ssl_socket.cc b/src/kudu/util/net/ssl_socket.cc
index c178ab4..3382521 100644
--- a/src/kudu/util/net/ssl_socket.cc
+++ b/src/kudu/util/net/ssl_socket.cc
@@ -22,6 +22,7 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
 #include "kudu/gutil/strings/util.h"
 #include "kudu/gutil/strings/split.h"