diff options
| author | Tom Yu <tlyu@mit.edu> | 2008-07-18 00:18:23 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2008-07-18 00:18:23 +0000 |
| commit | 3b13cbdbb028b6452b8c5a1207545e0a9b529f32 (patch) | |
| tree | e48b8deeda248321a2fa8692b68b58d817224e2d /src | |
| parent | d615494f776d692c84f246aaf458096e98fdc952 (diff) | |
| download | krb5-3b13cbdbb028b6452b8c5a1207545e0a9b529f32.zip krb5-3b13cbdbb028b6452b8c5a1207545e0a9b529f32.tar.gz krb5-3b13cbdbb028b6452b8c5a1207545e0a9b529f32.tar.bz2 | |
Make krb5_rc_io_creat() use mkstemp
ticket: 6002
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20537 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/rcache/rc_io.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c index 59d15c2..84c8338 100644 --- a/src/lib/krb5/rcache/rc_io.c +++ b/src/lib/krb5/rcache/rc_io.c @@ -68,7 +68,6 @@ getdir(void) krb5_error_code krb5_rc_io_creat(krb5_context context, krb5_rc_iostuff *d, char **fn) { - char *c; krb5_int16 rc_vno = htons(KRB5_RC_VNO); krb5_error_code retval = 0; int do_not_unlink = 0; @@ -86,24 +85,29 @@ krb5_rc_io_creat(krb5_context context, krb5_rc_iostuff *d, char **fn) d->fd = THREEPARAMOPEN(d->fn, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | O_BINARY, 0600); } else { - if (asprintf(&d->fn, "%s%skrb5_RC%daaa", - dir, PATH_SEPARATOR, (int) UNIQUE) < 0) { + if (asprintf(&d->fn, "%s%skrb5_RCXXXXXX", + dir, PATH_SEPARATOR) < 0) { d->fn = NULL; return KRB5_RC_IO_MALLOC; } - c = d->fn + strlen(d->fn) - 3; - while ((d->fd = THREEPARAMOPEN(d->fn, O_WRONLY | O_CREAT | O_TRUNC | - O_EXCL | O_BINARY, 0600)) == -1) { - if ((c[2]++) == 'z') { - c[2] = 'a'; - if ((c[1]++) == 'z') { - c[1] = 'a'; - if ((c[0]++) == 'z') - break; /* sigh */ - } + d->fd = mkstemp(d->fn); + if (d->fd != -1) { +#if defined(HAVE_FCHMOD) || defined(HAVE_CHMOD) +#ifdef HAVE_FCHMOD + retval = fchmod(d->fd, 0600); +#else + retval = chmod(d->fn, 0600); +#endif + if (retval == -1) { + retval = KRB5_RC_IO_UNKNOWN; + krb5_set_error_message(context, retval, + "Cannot chmod replay cache file %s: %s", + d->fn, strerror(errno)); + goto cleanup; } +#endif } - if (fn) { + if (retval != 0 && d->fd != -1 && fn) { *fn = strdup(d->fn + dirlen); if (*fn == NULL) { free(d->fn); |