>From f4db42d1518cf01a8912735cd3d4f5746700e5aa Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 12 Aug 2015 12:59:08 +0200 Subject: [PATCH 2/4] KRB5: Use sss_unique_file when creating kdcinfo files --- src/providers/krb5/krb5_common.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index be6c9e3540ad470307f4edb168f0ff6cc581632f..1b2aabec5f58e066a54a593ed0cd22bc8c32416a 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -409,7 +409,7 @@ done: } errno_t write_krb5info_file(const char *realm, const char *server, - const char *service) + const char *service) { int ret; int fd = -1; @@ -419,7 +419,6 @@ errno_t write_krb5info_file(const char *realm, const char *server, const char *name_tmpl = NULL; size_t server_len; ssize_t written; - mode_t old_umask; if (realm == NULL || *realm == '\0' || server == NULL || *server == '\0' || service == NULL || *service == '\0') { @@ -466,13 +465,10 @@ errno_t write_krb5info_file(const char *realm, const char *server, goto done; } - old_umask = umask(077); - fd = mkstemp(tmp_name); - umask(old_umask); + fd = sss_unique_file(tmp_ctx, tmp_name, &ret); if (fd == -1) { - ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - "mkstemp failed [%d][%s].\n", ret, strerror(ret)); + "sss_unique_file failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -502,6 +498,7 @@ errno_t write_krb5info_file(const char *realm, const char *server, } ret = close(fd); + fd = -1; if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, @@ -517,7 +514,12 @@ errno_t write_krb5info_file(const char *realm, const char *server, goto done; } + ret = EOK; done: + if (fd != -1) { + close(fd); + } + talloc_free(tmp_ctx); return ret; } -- 2.4.3