View | Details | Raw Unified | Return to bug 29609
Collapse All | Expand All

(-)pam_ssh.c (-7 / +8 lines)
Lines 199-205 Link Here
199 
	}
 199 
	}
200 
	pam_auth_dsa = auth_via_key(pamh, KEY_DSA, SSH_CLIENT_ID_DSA, dotdir,
 200 
	pam_auth_dsa = auth_via_key(pamh, KEY_DSA, SSH_CLIENT_ID_DSA, dotdir,
201 
	    pwd, pass);
 201 
	    pwd, pass);
202 
	pam_auth_rsa = auth_via_key(pamh, KEY_RSA, SSH_CLIENT_IDENTITY, dotdir,
 202 
	pam_auth_rsa = auth_via_key(pamh, KEY_RSA1, SSH_CLIENT_IDENTITY, dotdir,
203 
	    pwd, pass);
 203 
	    pwd, pass);
204 
	authenticated = 0;
 204 
	authenticated = 0;
205 
	if (pam_auth_dsa == PAM_SUCCESS)
 205 
	if (pam_auth_dsa == PAM_SUCCESS)
Lines 234-240 Link Here
234 
		/* RSA keys */
 234 
		/* RSA keys */
235 
		else if (strncmp(dotdir_ent->d_name, SSH2_RSA_PREFIX,
 235 
		else if (strncmp(dotdir_ent->d_name, SSH2_RSA_PREFIX,
236 
		    strlen(SSH2_RSA_PREFIX)) == 0)
 236 
		    strlen(SSH2_RSA_PREFIX)) == 0)
237 
			retval = auth_via_key(pamh, KEY_DSA,
 237 
			retval = auth_via_key(pamh, KEY_RSA,
238 
			    dotdir_ent->d_name, dotdir, pwd, pass);
 238 
			    dotdir_ent->d_name, dotdir, pwd, pass);
239 
		/* skip other files */
 239 
		/* skip other files */
240 
		else
 240 
		else
Lines 374-384 Link Here
374 
		if (env_fp)
 374 
		if (env_fp)
375 
			fputs(env_string, env_fp);
 375 
			fputs(env_string, env_fp);
376 
		env_value = strchr(env_string, '=');
 376 
		env_value = strchr(env_string, '=');
377 
		if (env_value == NULL) {
 377 
		if (env_value == NULL)
378 
			env_end = strchr(env_value, ';');
 378 
			continue;
379 
			if (env_end != NULL)
 379 
		env_end = strchr(env_value, ';');
380 
				continue;
 380 
		if (env_end == NULL)
381 
		}
 381 
			continue;
382 
		*env_end = '\0';
 382 
		*env_end = '\0';
383 
		/* pass to the application ... */
 383 
		/* pass to the application ... */
384 
		retval = pam_putenv(pamh, env_string);
 384 
		retval = pam_putenv(pamh, env_string);
Lines 388-393 Link Here
388 
				fclose(env_fp);
 388 
				fclose(env_fp);
389 
			PAM_RETURN(PAM_SERVICE_ERR);
 389 
			PAM_RETURN(PAM_SERVICE_ERR);
390 
		}
 390 
		}
391 
		(void)putenv(env_string);
391 
		*env_value++ = '\0';
 392 
		*env_value++ = '\0';
392 
		if (strcmp(&env_string[strlen(env_string) -
 393 
		if (strcmp(&env_string[strlen(env_string) -
393 
		    strlen(ENV_SOCKET_SUFFIX)], ENV_SOCKET_SUFFIX) == 0) {
 394 
		    strlen(ENV_SOCKET_SUFFIX)], ENV_SOCKET_SUFFIX) == 0) {

Return to bug 29609