diff options
| author |  Hongyu Chen <hongyu@google.com> | 2015-08-20 11:18:35 -0700 |
|---|---|---|
| committer | Hongyu Chen <hongyu@google.com> | 2015-08-20 11:18:35 -0700 |
| commit | c389bd22b7a293c536e5cf8e489019d239b680c6 (patch) | |
| tree | a517da608ea627bbf080454c79b531780c5a0a5b /src/core/security/google_default_credentials.c | |
| parent | fdc1dc744baa194f220a5d103ca73dde290c7d4b (diff) | |
| parent | 43a53ffa0a1fadb6bb90ec814ac43da24a6d2684 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/core/security/google_default_credentials.c')
| -rw-r--r-- | src/core/security/google_default_credentials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index d1f228665f..d6092ece32 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -203,8 +203,8 @@ end: /* Blend with default ssl credentials and add a global reference so that it can be cached and re-served. */ grpc_credentials *ssl_creds = grpc_ssl_credentials_create(NULL, NULL); - default_credentials = grpc_credentials_ref(grpc_composite_credentials_create( - ssl_creds, result)); + default_credentials = grpc_credentials_ref( + grpc_composite_credentials_create(ssl_creds, result)); GPR_ASSERT(default_credentials != NULL); grpc_credentials_unref(ssl_creds); grpc_credentials_unref(result); |