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 <[email protected]> Tested-by: Todd Lipcon <[email protected]> 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 <[email protected]> Authored: Wed Nov 2 15:08:39 2016 -0700 Committer: Todd Lipcon <[email protected]> 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());
