=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfd.c,v retrieving revision 1.49.2.2 retrieving revision 1.49.2.3 diff -u -r1.49.2.2 -r1.49.2.3 --- src/usr.bin/ssh/authfd.c 2002/10/11 14:51:52 1.49.2.2 +++ src/usr.bin/ssh/authfd.c 2003/04/03 22:35:16 1.49.2.3 @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfd.c,v 1.49.2.2 2002/10/11 14:51:52 miod Exp $"); +RCSID("$OpenBSD: authfd.c,v 1.49.2.3 2003/04/03 22:35:16 miod Exp $"); #include @@ -499,10 +499,10 @@ int ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key, - const char *comment, u_int life) + const char *comment, u_int life, u_int confirm) { Buffer msg; - int type, constrained = (life != 0); + int type, constrained = (life || confirm); buffer_init(&msg); @@ -532,6 +532,8 @@ buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); buffer_put_int(&msg, life); } + if (confirm != 0) + buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); } if (ssh_request_reply(auth, &msg, &msg) == 0) { buffer_free(&msg); @@ -545,7 +547,7 @@ int ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment) { - return ssh_add_identity_constrained(auth, key, comment, 0); + return ssh_add_identity_constrained(auth, key, comment, 0, 0); } /*