Module Name: src
Committed By: adam
Date: Sun Nov 21 20:41:36 UTC 2010
Modified Files:
src/lib/libpam/modules/pam_ssh: pam_ssh.c
Log Message:
Use ssh_add_identity_constrained() instead of ssh_add_identity()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.16
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.15 Sun Jan 27 01:23:20 2008
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Sun Nov 21 20:41:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.15 2008/01/27 01:23:20 christos Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam 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.15 2008/01/27 01:23:20 christos Exp $");
+__RCSID("$NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $");
#endif
#include <sys/param.h>
@@ -376,7 +376,7 @@
pam_err = pam_get_data(pamh, *kfn, &vp);
psk = vp;
if (pam_err == PAM_SUCCESS && psk != NULL) {
- if (ssh_add_identity(ac, psk->key, psk->comment))
+ if (ssh_add_identity_constrained(ac, psk->key, psk->comment, 0, 0))
openpam_log(PAM_LOG_DEBUG,
"added %s to ssh agent", psk->comment);
else
