diff options
| author | Andreas Schneider <asn@samba.org> | 2019-10-09 20:11:03 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-10-16 19:25:14 +0000 |
| commit | c191a37848ba01f503ee5fc5000d4ea1a1474500 (patch) | |
| tree | d3df8cfdd2d74f716ad1195142b5ddfc421ba30c | |
| parent | 0d292ca72a389010306e79e7f782783b452cc603 (diff) | |
| download | samba-c191a37848ba01f503ee5fc5000d4ea1a1474500.tar.gz | |
lib:krb5_wrap: Do not create a temporary file for MEMORY keytabs
The autobuild cleanup script fails with:
The tree has 3 new uncommitted files!!!
git clean -n
Would remove MEMORY:tmp_smb_creds_SK98Lv
Would remove MEMORY:tmp_smb_creds_kornU6
Would remove MEMORY:tmp_smb_creds_ljR828
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit d888655244b4d8ec7a69a042e0ff3c074585b0de)
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index a4e73c64f00..5aceae44eec 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -2002,26 +2002,23 @@ krb5_error_code smb_krb5_kinit_keyblock_ccache(krb5_context ctx, krb_options); #elif defined(HAVE_KRB5_GET_INIT_CREDS_KEYTAB) { -#define SMB_CREDS_KEYTAB "MEMORY:tmp_smb_creds_XXXXXX" - char tmp_name[sizeof(SMB_CREDS_KEYTAB)]; +#define SMB_CREDS_KEYTAB "MEMORY:tmp_kinit_keyblock_ccache" + char tmp_name[64] = {0}; krb5_keytab_entry entry; krb5_keytab keytab; - int tmpfd; - mode_t mask; + int rc; memset(&entry, 0, sizeof(entry)); entry.principal = principal; *(KRB5_KT_KEY(&entry)) = *keyblock; - memcpy(tmp_name, SMB_CREDS_KEYTAB, sizeof(SMB_CREDS_KEYTAB)); - mask = umask(S_IRWXO | S_IRWXG); - tmpfd = mkstemp(tmp_name); - umask(mask); - if (tmpfd == -1) { - DBG_ERR("Failed to mkstemp %s\n", tmp_name); + rc = snprintf(tmp_name, sizeof(tmp_name), + "%s-%p", + SMB_CREDS_KEYTAB, + &my_creds); + if (rc < 0) { return KRB5_KT_BADNAME; } - close(tmpfd); code = krb5_kt_resolve(ctx, tmp_name, &keytab); if (code) { return code; |