diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-06-02 22:01:08 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-06-02 22:01:08 +0000 |
| commit | b972b5040483db9d9cbc73ef4c557d655603538f (patch) | |
| tree | 83324ee28a64c50fc416cf06d9c175fa39d5f290 /src | |
| parent | 6c1c46f8276dcc7041c322f5d1a05625cfe9b774 (diff) | |
| download | krb5-b972b5040483db9d9cbc73ef4c557d655603538f.zip krb5-b972b5040483db9d9cbc73ef4c557d655603538f.tar.gz krb5-b972b5040483db9d9cbc73ef4c557d655603538f.tar.bz2 | |
pullup from trunk
ticket: 2584
version_fixed: 1.3.4
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16385 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/os/an_to_ln.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index efab58f..074a62a 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,8 @@ +2004-06-02 Tom Yu <tlyu@mit.edu> + + * an_to_ln.c (do_replacement): Patch from Bill Dodd to fix missing + braces in previous security patch. + 2004-06-01 Sam Hartman <hartmans@mit.edu> * an_to_ln.c (rule_an_to_ln): Fix buffer overflow when parsing diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index c134caf..2430b27 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -340,9 +340,10 @@ do_replacement(char *regexp, char *repl, int doall, char *in, char *out) strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out)); op += strlen(repl); cp += edispl; - if (!doall) + if (!doall) { use_bytes(strlen(cp)); strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out)); + } matched = 1; } else { |