diff options
| author | semery <none@none> | 2006-03-27 17:26:18 -0800 |
|---|---|---|
| committer | semery <none@none> | 2006-03-27 17:26:18 -0800 |
| commit | e49962a00eea60555f3c78ebf58a9a641590802c (patch) | |
| tree | b4ede2d07927bb1696cec270e0a010df8f982210 /usr/src/cmd/krb5 | |
| parent | 0ad689d678ef901f32945172f48ddc7b16dde50d (diff) | |
| download | illumos-joyent-e49962a00eea60555f3c78ebf58a9a641590802c.tar.gz | |
6362366 logic error in krb5 replay cache name parsing
6362413 double free in krb5 code
6366878 Double free in krb5_get_server_rcache
6388132 Since 1.4 resync, prompts with double ":"'s have cropped up
Diffstat (limited to 'usr/src/cmd/krb5')
| -rw-r--r-- | usr/src/cmd/krb5/kadmin/cli/kadmin.c | 10 | ||||
| -rw-r--r-- | usr/src/cmd/krb5/kadmin/dbutil/kdb5_create.c | 6 | ||||
| -rw-r--r-- | usr/src/cmd/krb5/kadmin/ktutil/ktutil_funcs.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/cmd/krb5/kadmin/cli/kadmin.c b/usr/src/cmd/krb5/kadmin/cli/kadmin.c index d08ada1dc6..7f43e14c34 100644 --- a/usr/src/cmd/krb5/kadmin/cli/kadmin.c +++ b/usr/src/cmd/krb5/kadmin/cli/kadmin.c @@ -1,5 +1,5 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -734,10 +734,10 @@ kadmin_cpw(argc, argv) unsigned int i = sizeof (newpw) - 1; snprintf(prompt1, sizeof (prompt1), - gettext("Enter password for principal \"%.900s\": "), + gettext("Enter password for principal \"%.900s\""), *argv); snprintf(prompt2, sizeof (prompt2), - gettext("Re-enter password for principal \"%.900s\": "), + gettext("Re-enter password for principal \"%.900s\""), *argv); retval = krb5_read_password(context, prompt1, prompt2, newpw, &i); @@ -1118,10 +1118,10 @@ kadmin_addprinc(argc, argv) } else if (pass == NULL) { unsigned int i = sizeof (newpw) - 1; snprintf(prompt1, sizeof (prompt1), - gettext("Enter password for principal \"%.900s\": "), + gettext("Enter password for principal \"%.900s\""), canon); snprintf(prompt2, sizeof (prompt1), - gettext("Re-enter password for principal \"%.900s\": "), + gettext("Re-enter password for principal \"%.900s\""), canon); retval = krb5_read_password(context, prompt1, prompt2, newpw, &i); diff --git a/usr/src/cmd/krb5/kadmin/dbutil/kdb5_create.c b/usr/src/cmd/krb5/kadmin/dbutil/kdb5_create.c index 30e96ca22d..350f9b54c7 100644 --- a/usr/src/cmd/krb5/kadmin/dbutil/kdb5_create.c +++ b/usr/src/cmd/krb5/kadmin/dbutil/kdb5_create.c @@ -1,5 +1,5 @@ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -274,9 +274,9 @@ kdb5_create(argc, argv) pw_str = malloc(pw_size); retval = krb5_read_password(util_context, - gettext("Enter KDC database master key:"), + gettext("Enter KDC database master key"), gettext("Re-enter KDC database " - "master key to verify:"), + "master key to verify"), pw_str, &pw_size); if (retval) { com_err(argv[0], retval, diff --git a/usr/src/cmd/krb5/kadmin/ktutil/ktutil_funcs.c b/usr/src/cmd/krb5/kadmin/ktutil/ktutil_funcs.c index 4c892a7410..15729bb1f1 100644 --- a/usr/src/cmd/krb5/kadmin/ktutil/ktutil_funcs.c +++ b/usr/src/cmd/krb5/kadmin/ktutil/ktutil_funcs.c @@ -1,5 +1,5 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -169,7 +169,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno, } (void) snprintf(promptstr, sizeof(promptstr), - gettext("Password for %.1000s: "), princ_str); + gettext("Password for %.1000s"), princ_str); retval = krb5_read_password(context, promptstr, NULL, password.data, &password.length); if (retval) |