summaryrefslogtreecommitdiff
path: root/authfd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-07 08:47:02 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-07 08:47:02 +1100
commit893d73549d7cfa277434bf0113688a5a14055408 (patch)
tree7cc83baeb70199c132f8f239be7acfcf694d0384 /authfd.c
parent6b286a46821fa230258f1da82d0e013cfe3bf685 (diff)
- djm@cvs.openbsd.org 2009/08/27 17:44:52
[authfd.c ssh-add.c authfd.h] Do not fall back to adding keys without contraints (ssh-add -c / -t ...) when the agent refuses the constrained add request. This was a useful migration measure back in 2002 when constraints were new, but just adds risk now. bz #1612, report and patch from dkg AT fifthhorseman.net; ok markus@
Diffstat (limited to 'authfd.c')
-rw-r--r--authfd.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/authfd.c b/authfd.c
index 61faad12..78a53c7a 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.80 2006/08/03 03:34:41 deraadt Exp $ */
+/* $OpenBSD: authfd.c,v 1.81 2009/08/27 17:44:52 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -545,12 +545,6 @@ ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
return decode_reply(type);
}
-int
-ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
-{
- return ssh_add_identity_constrained(auth, key, comment, 0, 0);
-}
-
/*
* Removes an identity from the authentication server. This call is not
* meant to be used by normal applications.