From owner-svn-src-all@freebsd.org Tue Jan 19 22:07:26 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE524A897E2; Tue, 19 Jan 2016 22:07:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF4141286; Tue, 19 Jan 2016 22:07:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 54853B93C; Tue, 19 Jan 2016 17:07:25 -0500 (EST) From: John Baldwin To: Dag-Erling =?ISO-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: 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... Date: Tue, 19 Jan 2016 14:07:20 -0800 Message-ID: <1547455.kXYNJo7ADU@ralph.baldwin.cx> User-Agent: KMail/4.14.3 (FreeBSD/10.2-STABLE; KDE/4.14.3; amd64; ; ) In-Reply-To: <201601191828.u0JISNSG087681@repo.freebsd.org> References: <201601191828.u0JISNSG087681@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 19 Jan 2016 17:07:25 -0500 (EST) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2016 22:07:27 -0000 On Tuesday, January 19, 2016 06:28:23 PM Dag-Erling Sm=F8rgrav wrote: > Author: des > Date: Tue Jan 19 18:28:23 2016 > New Revision: 294332 > URL: https://svnweb.freebsd.org/changeset/base/294332 >=20 > Log: > Upgrade to OpenSSH 6.8p1. This broke the build of pam_ssh. I am currently build testing an attem= pt 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) { -=09AuthenticationConnection *ac; =09const struct pam_ssh_key *psk; =09const char **kfn; =09const void *item; =09char **envlist, **env; -=09int pam_err; +=09int fd, pam_err; =20 =09/* switch to PAM environment */ =09envlist =3D environ; @@ -336,7 +335,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh) =09} =20 =09/* get a connection to the agent */ -=09if ((ac =3D ssh_get_authentication_connection()) =3D=3D NULL) { +=09if (ssh_get_authentication_socket(&fd) !=3D 0) { =09=09openpam_log(PAM_LOG_DEBUG, "failed to connect to the agent"); =09=09pam_err =3D PAM_SYSTEM_ERR; =09=09goto end; @@ -347,7 +346,7 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh) =09=09pam_err =3D pam_get_data(pamh, *kfn, &item); =09=09if (pam_err =3D=3D PAM_SUCCESS && item !=3D NULL) { =09=09=09psk =3D item; -=09=09=09if (ssh_add_identity(ac, psk->key, psk->comment)) +=09=09=09if (ssh_add_identity(fd, psk->key, psk->comment) =3D=3D 0) =09=09=09=09openpam_log(PAM_LOG_DEBUG, =09=09=09=09 "added %s to ssh agent", psk->comment); =09=09=09else @@ -360,8 +359,8 @@ pam_ssh_add_keys_to_agent(pam_handle_t *pamh) =09pam_err =3D PAM_SUCCESS; end: =09/* disconnect from agent */ -=09if (ac !=3D NULL) -=09=09ssh_close_authentication_connection(ac); +=09if (fd !=3D -1) +=09=09ssh_close_authentication_connection(fd); =20 =09/* switch back to original environment */ =09for (env =3D environ; *env !=3D NULL; ++env) --=20 John Baldwin