svn commit: r294332 - in head: crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/caldera crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/op...

[John Baldwin]

On Tuesday, January 19, 2016 06:28:23 PM Dag-Erling Smørgrav wrote:
> Author: des
> Date: Tue Jan 19 18:28:23 2016
> New Revision: 294332
> URL: https://svnweb.freebsd.org/changeset/base/294332
> 
> Log:
>   Upgrade to OpenSSH 6.8p1.

This broke the build of pam_ssh.  I am currently build testing an attempt
at fixing:

diff --git lib/libpam/modules/pam_ssh/pam_ssh.c lib/libpam/modules/pam_ssh/pam_ssh.c
index 405dd6b..f2ad6cf 100644
--- lib/libpam/modules/pam_ssh/pam_ssh.c
+++ lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -321,12 +321,11 @@ pam_ssh_start_agent(pam_handle_t *pamh)
 static int
 pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
 {
-	AuthenticationConnection *ac;
 	const struct pam_ssh_key *psk;
 	const char **kfn;
 	const void *item;
 	char **envlist, **env;
-	int pam_err;
+	int fd, pam_err;
 
 	/* switch to PAM environment */
 	envlist = environ;
@@ -336,7 +335,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
 	}
 
 	/* get a connection to the agent */
-	if ((ac = ssh_get_authentication_connection()) == NULL) {
+	if (ssh_get_authentication_socket(&fd) != 0) {
 		openpam_log(PAM_LOG_DEBUG, "failed to connect to the agent");
 		pam_err = PAM_SYSTEM_ERR;
 		goto end;
@@ -347,7 +346,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
 		pam_err = pam_get_data(pamh, *kfn, &item);
 		if (pam_err == PAM_SUCCESS && item != NULL) {
 			psk = item;
-			if (ssh_add_identity(ac, psk->key, psk->comment))
+			if (ssh_add_identity(fd, psk->key, psk->comment) == 0)
 				openpam_log(PAM_LOG_DEBUG,
 				    "added %s to ssh agent", psk->comment);
 			else
@@ -360,8 +359,8 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh)
 	pam_err = PAM_SUCCESS;
  end:
 	/* disconnect from agent */
-	if (ac != NULL)
-		ssh_close_authentication_connection(ac);
+	if (fd != -1)
+		ssh_close_authentication_connection(fd);
 
 	/* switch back to original environment */
 	for (env = environ; *env != NULL; ++env)

-- 
John Baldwin