Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libpam/modules/pam_ssh Use ssh_add_identity_constrained(...



details:   https://anonhg.NetBSD.org/src/rev/6c4514a40d52
branches:  trunk
changeset: 758935:6c4514a40d52
user:      adam <adam%NetBSD.org@localhost>
date:      Sun Nov 21 20:41:36 2010 +0000

description:
Use ssh_add_identity_constrained() instead of ssh_add_identity()

diffstat:

 lib/libpam/modules/pam_ssh/pam_ssh.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5f6879cf4d0d -r 6c4514a40d52 lib/libpam/modules/pam_ssh/pam_ssh.c
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c      Sun Nov 21 20:02:35 2010 +0000
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c      Sun Nov 21 20:41:36 2010 +0000
@@ -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



Home | Main Index | Thread Index | Old Index