merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-02-11 21:03:59 +00:00
parent 0a6c3f7fde
commit aaae186ab9
83 changed files with 4175 additions and 1509 deletions

View File

@@ -61,17 +61,21 @@ usage(void)
static int
do_cpw_entry(krb5_principal principal, void *data)
{
char *pw, pwbuf[128], prompt[128], *pr;
char *pw, pwbuf[128];
struct cpw_entry_data *e = data;
krb5_error_code ret = 0;
pw = e->password;
if(e->random == 0){
if(pw == NULL){
krb5_unparse_name(context, principal, &pr);
snprintf(prompt, sizeof(prompt), "%s's Password: ", pr);
free(pr);
char *princ_name;
char *prompt;
krb5_unparse_name(context, principal, &princ_name);
asprintf(&prompt, "%s's Password: ", princ_name);
free (princ_name);
ret = des_read_pw_string(pwbuf, sizeof(pwbuf), prompt, 1);
free (prompt);
if(ret){
return 0; /* XXX error code? */
}