Merge branch 'master' of github.com:grpc/grpc into decompression

# Conflicts:
#	Makefile
#	include/grpc++/client_context.h
#	include/grpc++/server_context.h
#	src/cpp/client/client_context.cc
#	src/cpp/server/server_context.cc
#	vsprojects/Grpc.mak

1 files changed, 8 insertions, 0 deletions

diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc
index 0eba554e33..cc5f51d618 100644
--- a/src/cpp/client/client_context.cc
+++ b/src/cpp/client/client_context.cc
@@ -39,6 +39,7 @@
 #include <grpc++/time.h>
 
 #include "src/core/channel/compress_filter.h"
+#include "src/cpp/common/create_auth_context.h"
 
 namespace grpc {
 
@@ -96,6 +97,13 @@ void ClientContext::set_compression_algorithm(
   AddMetadata(GRPC_COMPRESS_REQUEST_ALGORITHM_KEY, algorithm_name);
 }
 
+std::shared_ptr<const AuthContext> ClientContext::auth_context() const {
+  if (auth_context_.get() == nullptr) {
+    auth_context_ = CreateAuthContext(call_);
+  }
+  return auth_context_;
+}
+
 void ClientContext::TryCancel() {
   if (call_) {
     grpc_call_cancel(call_);