Skip to content

Commit

Permalink
Merge pull request grpc#10252 from jboeuf/no_creds_assert_in_server_a…
Browse files Browse the repository at this point in the history
…uth_filter

Removing credentials assert in server_auth_filter.
  • Loading branch information
rjshade authored Mar 22, 2017
2 parents be0dba1 + 8f0fd82 commit 3f90a95
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/core/lib/security/transport/server_auth_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static void auth_on_recv(grpc_exec_ctx *exec_ctx, void *user_data,
call_data *calld = elem->call_data;
channel_data *chand = elem->channel_data;
if (error == GRPC_ERROR_NONE) {
if (chand->creds->processor.process != NULL) {
if (chand->creds != NULL && chand->creds->processor.process != NULL) {
calld->md = metadata_batch_to_md_array(calld->recv_initial_metadata);
chand->creds->processor.process(
chand->creds->processor.state, calld->auth_context,
Expand Down Expand Up @@ -242,7 +242,6 @@ static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx,

GPR_ASSERT(!args->is_last);
GPR_ASSERT(auth_context != NULL);
GPR_ASSERT(creds != NULL);

/* initialize members */
chand->auth_context =
Expand Down

0 comments on commit 3f90a95

Please sign in to comment.