diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-02-25 23:14:40 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-02-25 23:14:40 +0000 |
| commit | aa52218d22c19ba97720a69bfcbfe5e23586f6e9 (patch) | |
| tree | 725c60f221438c2cc9333cab129efa725353ac42 /src/lib/krb5 | |
| parent | ca3b1ca532029b4d201d17f683ad77beed4f880a (diff) | |
| download | krb5-aa52218d22c19ba97720a69bfcbfe5e23586f6e9.zip krb5-aa52218d22c19ba97720a69bfcbfe5e23586f6e9.tar.gz krb5-aa52218d22c19ba97720a69bfcbfe5e23586f6e9.tar.bz2 | |
Handle NULL result_string->data returned from error in
krb5_change_password(). The SAMDATA() macro in
lib/krb5/krb/preauth2.c seems to already be fixed.
KfM's kpasswd equivalent still needs to be dealt with.
ticket: 1055
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15204 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/krb/gic_pwd.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 95da8d8..036e8ed 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,8 @@ +2003-02-25 Tom Yu <tlyu@mit.edu> + + * gic_pwd.c (krb5_get_init_creds_password): Don't pass a NULL + pointer to sprintf(). + 2003-02-14 Sam Hartman <hartmans@mit.edu> * preauth2.c (krb5_do_preauth): Sort incoming etype info based on diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c index 7bc4d5a..7b5e0ba 100644 --- a/src/lib/krb5/krb/gic_pwd.c +++ b/src/lib/krb5/krb/gic_pwd.c @@ -261,8 +261,9 @@ krb5_get_init_creds_password(krb5_context context, krb5_creds *creds, krb5_princ sprintf(banner, "%.*s%s%.*s. Please try again.\n", (int) code_string.length, code_string.data, - result_string.length?": ":"", - (int) result_string.length, result_string.data); + result_string.length ? ": " : "", + (int) result_string.length, + result_string.data ? result_string.data : ""); krb5_xfree(code_string.data); krb5_xfree(result_string.data); |