diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-06-23 22:53:06 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-06-23 22:53:06 +0000 |
| commit | 0b43573b23f515c6189da100e08532f5edb985d8 (patch) | |
| tree | d1c2fc6767154af0eac2b17d109964031a2bc490 /src/tests/create | |
| parent | c83b145bce9ead5008064c710c17bf66915cda88 (diff) | |
| download | krb5-0b43573b23f515c6189da100e08532f5edb985d8.tar.gz krb5-0b43573b23f515c6189da100e08532f5edb985d8.tar.xz krb5-0b43573b23f515c6189da100e08532f5edb985d8.zip | |
merge from krb5-1-2-beta4
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12427 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/create')
| -rw-r--r-- | src/tests/create/ChangeLog | 10 | ||||
| -rw-r--r-- | src/tests/create/kdb5_mkdums.c | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog index 100db876a8..1d080084ce 100644 --- a/src/tests/create/ChangeLog +++ b/src/tests/create/ChangeLog @@ -1,3 +1,13 @@ +2000-05-11 Nalin Dahyabhai <nalin@redhat.com> + + * kdb5_mkdums.c (main): Make sure buffer 'principal' is terminated. + +2000-05-08 Ken Raeburn <raeburn@mit.edu> + Nalin Dahyabhai <nalin@redhat.com> + + * kdb5_mkdums.c (main): Make sure buffer "tmp" is + null-terminated. Don't overflow buffer "tmp" or "tmp2". + 1999-10-26 Wilfredo Sanchez <tritan@mit.edu> * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c index 3cacc19df1..aa1854c8f4 100644 --- a/src/tests/create/kdb5_mkdums.c +++ b/src/tests/create/kdb5_mkdums.c @@ -130,7 +130,8 @@ char *argv[]; mkey_password = optarg; break; case 'p': /* prefix name to create */ - strcpy(principal_string, optarg); + strncpy(principal_string, optarg, sizeof(principal_string) - 1); + principal_string[sizeof(principal_string) - 1] = '\0'; suffix = principal_string + strlen(principal_string); break; case 'n': /* how many to create */ @@ -195,13 +196,14 @@ char *argv[]; again given a prefix and count to test the db lib and kdb */ (void) sprintf(suffix, "%d", n); (void) sprintf(tmp, "%s-DEPTH-1", principal_string); + tmp[sizeof(tmp) - 1] = '\0'; str_newprinc = tmp; add_princ(test_context, str_newprinc); for (i = 2; i <= depth; i++) { - tmp2[0] = '\0'; (void) sprintf(tmp2, "/%s-DEPTH-%d", principal_string, i); - strcat(tmp, tmp2); + tmp2[sizeof(tmp2) - 1] = '\0'; + strncat(tmp, tmp2, sizeof(tmp) - 1 - strlen(tmp)); str_newprinc = tmp; add_princ(test_context, str_newprinc); } |