From 6626068f0c4463bdd65a802dc4a00b8af4f598d0 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Mon, 18 Aug 2014 17:40:41 -0400 Subject: sss_client: Fix "struct sss_cli_mc_ctx" reinitialize-on-errors When we have difficulty setting up an sss_cli_mc_ctx structure, we try to clean things up so that we'll be ready to try again the next time we're called. Part of that is closing the descriptor of the file if we've opened it and using memset() to clear the structure. Now that sss_nss_mc_get_ctx() does its work in two phases, and each one may end up doing the cleanup, each needs to be careful to reset the descriptor field so that the new value provided by memset() (0) isn't mistakenly treated as a file which should be closed by the other. Resolves: https://fedorahosted.org/sssd/ticket/2409 Reviewed-by: Simo Sorce (cherry picked from commit 5a4df83d769ace54f92513f0be78e753e0985a25) --- src/sss_client/nss_mc_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sss_client/nss_mc_common.c b/src/sss_client/nss_mc_common.c index edbf7b824..119d528c0 100644 --- a/src/sss_client/nss_mc_common.c +++ b/src/sss_client/nss_mc_common.c @@ -164,6 +164,7 @@ done: close(ctx->fd); } memset(ctx, 0, sizeof(struct sss_cli_mc_ctx)); + ctx->fd = -1; } free(file); sss_nss_unlock(); @@ -197,6 +198,7 @@ done: close(ctx->fd); } memset(ctx, 0, sizeof(struct sss_cli_mc_ctx)); + ctx->fd = -1; } return ret; } -- cgit