Commit 025bfd11 authored by Damien Miller's avatar Damien Miller

- (djm) [auth-krb5.c] Save errno across calls that might modify it;

   ok dtucker@
parent 7584cb1a
20120426
- (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters
via Niels
- (djm) [auth-krb5.c] Save errno across calls that might modify it;
ok dtucker@
20120423
- OpenBSD CVS Sync
......
......@@ -226,7 +226,7 @@ krb5_cleanup_proc(Authctxt *authctxt)
#ifndef HEIMDAL
krb5_error_code
ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
int tmpfd, ret;
int tmpfd, ret, oerrno;
char ccname[40];
mode_t old_umask;
......@@ -237,16 +237,18 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
old_umask = umask(0177);
tmpfd = mkstemp(ccname + strlen("FILE:"));
oerrno = errno;
umask(old_umask);
if (tmpfd == -1) {
logit("mkstemp(): %.100s", strerror(errno));
return errno;
logit("mkstemp(): %.100s", strerror(oerrno));
return oerrno;
}
if (fchmod(tmpfd,S_IRUSR | S_IWUSR) == -1) {
logit("fchmod(): %.100s", strerror(errno));
oerrno = errno;
logit("fchmod(): %.100s", strerror(oerrno));
close(tmpfd);
return errno;
return oerrno;
}
close(tmpfd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment