- (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.

diff --git a/ChangeLog b/ChangeLog
index 8ea386d48f016a4f6c71233a2ab03b44611234e4..7615114bf97d04da08d4038962ba39df23d896d2 100644 (file)
--- 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

diff --git a/auth-krb5.c b/auth-krb5.c
index 01b387c233ae5e98d99865ecb5fa00bf19339b61..6ae4f5fc4a32df682f85c142d728c6e2570d217e 100644 (file)
--- 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:"));