Attachment 16061 Details for Bug 29609 – file.diff

[patch] file.diff

file.diff (text/plain), 1.55 KB, created by SANETO Takanori on 2001-08-10 18:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: SANETO Takanori

Created: 2001-08-10 18:00:00 UTC

Size: 1.55 KB

patch

obsolete

>Index: pam_ssh.c
>===================================================================
>RCS file: /export/cvsup/cvs/src/lib/libpam/modules/pam_ssh/pam_ssh.c,v
>retrieving revision 1.14
>diff -u -u -r1.14 pam_ssh.c
>--- pam_ssh.c	2001/08/04 21:51:14	1.14
>+++ pam_ssh.c	2001/08/07 14:02:37
>@@ -199,7 +199,7 @@
> 	}
> 	pam_auth_dsa = auth_via_key(pamh, KEY_DSA, SSH_CLIENT_ID_DSA, dotdir,
> 	    pwd, pass);
>-	pam_auth_rsa = auth_via_key(pamh, KEY_RSA, SSH_CLIENT_IDENTITY, dotdir,
>+	pam_auth_rsa = auth_via_key(pamh, KEY_RSA1, SSH_CLIENT_IDENTITY, dotdir,
> 	    pwd, pass);
> 	authenticated = 0;
> 	if (pam_auth_dsa == PAM_SUCCESS)
>@@ -234,7 +234,7 @@
> 		/* RSA keys */
> 		else if (strncmp(dotdir_ent->d_name, SSH2_RSA_PREFIX,
> 		    strlen(SSH2_RSA_PREFIX)) == 0)
>-			retval = auth_via_key(pamh, KEY_DSA,
>+			retval = auth_via_key(pamh, KEY_RSA,
> 			    dotdir_ent->d_name, dotdir, pwd, pass);
> 		/* skip other files */
> 		else
>@@ -374,11 +374,11 @@
> 		if (env_fp)
> 			fputs(env_string, env_fp);
> 		env_value = strchr(env_string, '=');
>-		if (env_value == NULL) {
>-			env_end = strchr(env_value, ';');
>-			if (env_end != NULL)
>-				continue;
>-		}
>+		if (env_value == NULL)
>+			continue;
>+		env_end = strchr(env_value, ';');
>+		if (env_end == NULL)
>+			continue;
> 		*env_end = '\0';
> 		/* pass to the application ... */
> 		retval = pam_putenv(pamh, env_string);
>@@ -388,6 +388,7 @@
> 				fclose(env_fp);
> 			PAM_RETURN(PAM_SERVICE_ERR);
> 		}
>+		(void)putenv(env_string);
> 		*env_value++ = '\0';
> 		if (strcmp(&env_string[strlen(env_string) -
> 		    strlen(ENV_SOCKET_SUFFIX)], ENV_SOCKET_SUFFIX) == 0) {

Actions: View | Diff

Attachments on bug 29609: 16061