diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-06-28 14:17:39 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-06-28 14:17:39 -0700 |
| commit | 13c22ae59506ff2de95b105077cdef31ae4a1393 (patch) | |
| tree | 9e20729ebe892a8b81032215d6b1bd2937facf1a /test/core/security/oauth2_utils.c | |
| parent | 00338657d949f248e5b978b2c03769f9ae19b53b (diff) | |
| parent | fe466b0e170120263811ab12a4406c7438201481 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'test/core/security/oauth2_utils.c')
| -rw-r--r-- | test/core/security/oauth2_utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index a334edc32d..9b97c38fcb 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -53,7 +53,8 @@ typedef struct { static void on_oauth2_response(grpc_exec_ctx *exec_ctx, void *user_data, grpc_credentials_md *md_elems, size_t num_md, - grpc_credentials_status status) { + grpc_credentials_status status, + const char *error_details) { oauth2_request *request = user_data; char *token = NULL; gpr_slice token_slice; |