Attachment 915 Details for Bug 1039 – use HostKeyAlias as password prompt if set

[patch] use HostKeyAlias as password prompt if set

openssh-pwprompt-hostkeyalias.patch (text/plain), 2.33 KB, created by Darren Tucker on 2005-05-16 17:12:16 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-05-16 17:12:16 AEST

Size: 2.33 KB

patch

obsolete

>Index: sshconnect2.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/sshconnect2.c,v
>retrieving revision 1.127
>diff -u -p -r1.127 sshconnect2.c
>--- sshconnect2.c	15 Jun 2004 00:30:09 -0000	1.127
>+++ sshconnect2.c	16 May 2005 07:06:00 -0000
>@@ -724,6 +724,8 @@ userauth_passwd(Authctxt *authctxt)
> 	static int attempt = 0;
> 	char prompt[150];
> 	char *password;
>+	const char *host = options.host_key_alias ?  options.host_key_alias :
>+	    authctxt->host;
> 
> 	if (attempt++ >= options.number_of_password_prompts)
> 		return 0;
>@@ -732,7 +734,7 @@ userauth_passwd(Authctxt *authctxt)
> 		error("Permission denied, please try again.");
> 
> 	snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ",
>-	    authctxt->server_user, authctxt->host);
>+	    authctxt->server_user, host);
> 	password = read_passphrase(prompt, 0);
> 	packet_start(SSH2_MSG_USERAUTH_REQUEST);
> 	packet_put_cstring(authctxt->server_user);
>@@ -759,6 +761,8 @@ input_userauth_passwd_changereq(int type
> 	Authctxt *authctxt = ctxt;
> 	char *info, *lang, *password = NULL, *retype = NULL;
> 	char prompt[150];
>+	const char *host = options.host_key_alias ? options.host_key_alias :
>+	    authctxt->host;
> 
> 	debug2("input_userauth_passwd_changereq");
> 
>@@ -779,7 +783,7 @@ input_userauth_passwd_changereq(int type
> 	packet_put_char(1);			/* additional info */
> 	snprintf(prompt, sizeof(prompt),
> 	    "Enter %.30s@%.128s's old password: ",
>-	    authctxt->server_user, authctxt->host);
>+	    authctxt->server_user, host);
> 	password = read_passphrase(prompt, 0);
> 	packet_put_cstring(password);
> 	memset(password, 0, strlen(password));
>@@ -788,7 +792,7 @@ input_userauth_passwd_changereq(int type
> 	while (password == NULL) {
> 		snprintf(prompt, sizeof(prompt),
> 		    "Enter %.30s@%.128s's new password: ",
>-		    authctxt->server_user, authctxt->host);
>+		    authctxt->server_user, host);
> 		password = read_passphrase(prompt, RP_ALLOW_EOF);
> 		if (password == NULL) {
> 			/* bail out */
>@@ -796,7 +800,7 @@ input_userauth_passwd_changereq(int type
> 		}
> 		snprintf(prompt, sizeof(prompt),
> 		    "Retype %.30s@%.128s's new password: ",
>-		    authctxt->server_user, authctxt->host);
>+		    authctxt->server_user, host);
> 		retype = read_passphrase(prompt, 0);
> 		if (strcmp(password, retype) != 0) {
> 			memset(password, 0, strlen(password));

Actions: View | Diff

Attachments on bug 1039: 911 | 915