pull up r22278 from trunk
authorTom Yu <tlyu@mit.edu>
Mon, 11 May 2009 20:55:22 +0000 (20:55 +0000)
committerTom Yu <tlyu@mit.edu>
Mon, 11 May 2009 20:55:22 +0000 (20:55 +0000)
 ------------------------------------------------------------------------
 r22278 | ghudson | 2009-04-24 15:49:54 -0400 (Fri, 24 Apr 2009) | 9 lines
 Changed paths:
    M /trunk/src/lib/krb5/keytab/kt_file.c

 ticket: 6475
 status: open
 tags: pullup
 target_version: 1.7

 In krb5_ktfileint_find_slot, don't continue the loop when we find a
 final zero-length buffer.  This is a minimal fix intended to be pulled
 up to the 1.7 branch; a code cleanup commit will follow.

ticket: 6475
version_fixed: 1.7

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22328 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/krb5/keytab/kt_file.c

index 2e33886a7e635095e14b4fe2a89bac40e5d5c03c..90f6bd8c8e5287a146bf9b6aba0de877b2de79c8 100644 (file)
@@ -1754,6 +1754,7 @@ krb5_ktfileint_find_slot(krb5_context context, krb5_keytab id, krb5_int32 *size_
                 if (fseek(KTFILEP(id), zero_point, SEEK_SET)) {
                     return errno;
                 }
+               found = TRUE;
             }
         }
     }