From a83f2612c275aea3168cadd94433590aa15a8ad3 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 7 Jul 2005 20:09:35 +1000 Subject: - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno in the case where the buffer is insufficient, so always return ENOMEM. Also pointed out by sxw at inf.ed.ac.uk. --- ChangeLog | 12 ++++++++---- auth-krb5.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 823c34bc2..5e4d01470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 20050707 - - [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for the MIT - Kerberos code path into a common function and expand mkstemp template to be - consistent with the rest of OpenSSH. From sxw at inf.ed.ac.uk, ok djm@ + - dtucker [auth-krb5.c auth.h gss-serv-krb5.c] Move KRB5CCNAME generation for + the MIT Kerberos code path into a common function and expand mkstemp + template to be consistent with the rest of OpenSSH. From sxw at + inf.ed.ac.uk, ok djm@ + - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno + in the case where the buffer is insufficient, so always return ENOMEM. + Also pointed out by sxw at inf.ed.ac.uk. 20050706 - (djm) OpenBSD CVS Sync @@ -2787,4 +2791,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3836 2005/07/07 01:50:20 dtucker Exp $ +$Id: ChangeLog,v 1.3837 2005/07/07 10:09:35 dtucker Exp $ diff --git a/auth-krb5.c b/auth-krb5.c index 01b387c23..6ae4f5fc4 100644 --- a/auth-krb5.c +++ b/auth-krb5.c @@ -222,7 +222,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { ret = snprintf(ccname, sizeof(ccname), "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); if (ret == -1 || ret >= sizeof(ccname)) - return errno; + return ENOMEM; old_umask = umask(0177); tmpfd = mkstemp(ccname + strlen("FILE:")); -- cgit v1.2.3