diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-07-01 00:51:58 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-07-01 00:51:58 +0000 |
| commit | b63a75c40310afc82e4af5372f92bec2e0a4c67e (patch) | |
| tree | 21afaf6fefb69b3e9692ac78785e8023904713c1 /src/kadmin/passwd | |
| parent | 7d348b141e39e286d544f0d72173a1a60f6ce434 (diff) | |
| download | krb5-b63a75c40310afc82e4af5372f92bec2e0a4c67e.tar.gz krb5-b63a75c40310afc82e4af5372f92bec2e0a4c67e.tar.xz krb5-b63a75c40310afc82e4af5372f92bec2e0a4c67e.zip | |
pullup from 1.2-beta4
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12497 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/passwd')
| -rw-r--r-- | src/kadmin/passwd/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin/passwd/xm_kpasswd.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog index 1334d2378e..cb9d7382f5 100644 --- a/src/kadmin/passwd/ChangeLog +++ b/src/kadmin/passwd/ChangeLog @@ -1,3 +1,7 @@ +2000-05-08 Nalin Dahyabhai <nalin@redhat.com> + + * xm_kpasswd.c (motif_com_err): Don't overflow buffer "buf". + 1999-10-26 Wilfredo Sanchez <tritan@mit.edu> * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, diff --git a/src/kadmin/passwd/xm_kpasswd.c b/src/kadmin/passwd/xm_kpasswd.c index 0db1111c64..4232e3baf4 100644 --- a/src/kadmin/passwd/xm_kpasswd.c +++ b/src/kadmin/passwd/xm_kpasswd.c @@ -111,13 +111,15 @@ motif_com_err (whoami, code, fmt, args) if (whoami) { - strcpy(buf, whoami); - strcat(buf, ": "); + strncpy(buf, whoami, sizeof(buf) - 1); + buf[sizeof(buf) - 1] = '\0'; + strncat(buf, ": ", sizeof(buf) - 1 - strlen(buf)); } if (code) { - strcat(buf, error_message(code)); - strcat(buf, " "); + buf[sizeof(buf) - 1] = '\0'; + strncat(buf, error_message(code), sizeof(buf) - 1 - strlen(buf)); + strncat(buf, " ", sizeof(buf) - 1 - strlen(buf)); } if (fmt) { |