[src/trunk]: src/lib/libpam/modules/pam_ssh fix and use the macro.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0e3e52d14cd3
branches:  trunk
changeset: 321839:0e3e52d14cd3
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 07 19:28:32 2018 +0000

description:
fix and use the macro.

diffstat:

 lib/libpam/modules/pam_ssh/pam_ssh.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 4822d0295430 -r 0e3e52d14cd3 lib/libpam/modules/pam_ssh/pam_ssh.c
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c      Sat Apr 07 19:18:44 2018 +0000
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c      Sat Apr 07 19:28:32 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pam_ssh.c,v 1.24 2018/04/07 13:57:12 christos Exp $    */
+/*     $NetBSD: pam_ssh.c,v 1.25 2018/04/07 19:28:32 christos Exp $    */
 
 /*-
  * Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $");
 #else
-__RCSID("$NetBSD: pam_ssh.c,v 1.24 2018/04/07 13:57:12 christos Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.25 2018/04/07 19:28:32 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -68,7 +68,7 @@
 #include "authfile.h"
 
 #define ssh_add_identity(auth, key, comment) \
-       ssh_add_identity_constrained(auth, key, comment, 0, 0)
+       ssh_add_identity_constrained(auth, key, comment, 0, 0, 0)
 
 extern char **environ;
 
@@ -383,8 +383,7 @@
                pam_err = pam_get_data(pamh, *kfn, &vp);
                psk = vp;
                if (pam_err == PAM_SUCCESS && psk != NULL) {
-                       if (ssh_add_identity_constrained(agent_fd, psk->key,
-                           psk->comment, 0, 0, 0))
+                       if (ssh_add_identity(agent_fd, psk->key, psk->comment))
                                openpam_log(PAM_LOG_DEBUG,
                                    "added %s to ssh agent", psk->comment);
                        else