[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mesos-commits
Subject:    git commit: Build against different SASL versions.
From:       benh () apache ! org
Date:       2013-09-27 1:26:30
Message-ID: 83b71efba59440f2891d382b3a5cf24e () git ! apache ! org
[Download RAW message or body]

Updated Branches:
  refs/heads/master 50db57694 -> da9c30a0b


Build against different SASL versions.

Review: https://reviews.apache.org/r/14358


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

Branch: refs/heads/master
Commit: da9c30a0b078268b92040c847a17d9323bab4070
Parents: 50db576
Author: Benjamin Hindman <benjamin.hindman@gmail.com>
Authored: Thu Sep 26 17:50:29 2013 -0700
Committer: Benjamin Hindman <benjamin.hindman@gmail.com>
Committed: Thu Sep 26 17:59:51 2013 -0700

----------------------------------------------------------------------
 src/sasl/auxprop.cpp | 10 +++++++++-
 src/sasl/auxprop.hpp |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/da9c30a0/src/sasl/auxprop.cpp
----------------------------------------------------------------------
diff --git a/src/sasl/auxprop.cpp b/src/sasl/auxprop.cpp
index 9547cc8..6de1222 100644
--- a/src/sasl/auxprop.cpp
+++ b/src/sasl/auxprop.cpp
@@ -48,7 +48,11 @@ int InMemoryAuxiliaryPropertyPlugin::initialize(
 }
 
 
-void InMemoryAuxiliaryPropertyPlugin::lookup(
+#if SASL_AUXPROP_PLUG_VERSION <= 4
+  void InMemoryAuxiliaryPropertyPlugin::lookup(
+#else
+  int InMemoryAuxiliaryPropertyPlugin::lookup(
+#endif
     void* context,
     sasl_server_params_t* sparams,
     unsigned flags,
@@ -171,6 +175,10 @@ void InMemoryAuxiliaryPropertyPlugin::lookup(
       }
     }
   }
+
+#if SASL_AUXPROP_PLUG_VERSION > 4
+  return SASL_OK;
+#endif
 }
 
 } // namespace sasl {

http://git-wip-us.apache.org/repos/asf/mesos/blob/da9c30a0/src/sasl/auxprop.hpp
----------------------------------------------------------------------
diff --git a/src/sasl/auxprop.hpp b/src/sasl/auxprop.hpp
index 44e773c..44e201b 100644
--- a/src/sasl/auxprop.hpp
+++ b/src/sasl/auxprop.hpp
@@ -73,7 +73,11 @@ public:
       const char* name);
 
 private:
+#if SASL_AUXPROP_PLUG_VERSION <= 4
   static void lookup(
+#else
+  static int lookup(
+#endif
       void* context,
       sasl_server_params_t* sparams,
       unsigned flags,


[prev in list] [next in list] [prev in thread] [next in thread]