Module Name: src Committed By: christos Date: Sat Apr 7 19:28:32 UTC 2018
Modified Files: src/lib/libpam/modules/pam_ssh: pam_ssh.c Log Message: fix and use the macro. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/lib/libpam/modules/pam_ssh/pam_ssh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.24 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.25 --- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.24 Sat Apr 7 09:57:12 2018 +++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Sat Apr 7 15:28:32 2018 @@ -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 @@ __RCSID("$NetBSD: pam_ssh.c,v 1.24 2018/ #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_ssh_add_keys_to_agent(pam_handle_t * 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