===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.53.2.3
retrieving revision 1.54
diff -u -r1.53.2.3 -r1.54
--- src/usr.bin/ssh/ssh-add.c	2003/04/03 22:35:17	1.53.2.3
+++ src/usr.bin/ssh/ssh-add.c	2002/06/05 19:57:12	1.54
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.53.2.3 2003/04/03 22:35:17 miod Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.54 2002/06/05 19:57:12 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -48,7 +48,6 @@
 #include "authfile.h"
 #include "pathnames.h"
 #include "readpass.h"
-#include "misc.h"
 
 /* argv0 */
 extern char *__progname;
@@ -61,12 +60,7 @@
 	NULL
 };
 
-/* Default lifetime (0 == forever) */
-static int lifetime = 0;
 
-/* User has to confirm key use */
-static int confirm = 0;
-
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
 static void
@@ -161,23 +155,11 @@
 			strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
 		}
 	}
-
- 	if (ssh_add_identity_constrained(ac, private, comment, lifetime,
- 	    confirm)) {
+	if (ssh_add_identity(ac, private, comment)) {
 		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
 		ret = 0;
-		if (lifetime != 0)
-			fprintf(stderr,
-			    "Lifetime set to %d seconds\n", lifetime);
- 		if (confirm != 0)
-			fprintf(stderr,
-			    "The user has to confirm each use of the key\n");
-	} else if (ssh_add_identity(ac, private, comment)) {
-		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
-		ret = 0;
-	} else {
+	} else
 		fprintf(stderr, "Could not add identity: %s\n", filename);
-	}
 
 	xfree(comment);
 	key_free(private);
@@ -189,7 +171,6 @@
 update_card(AuthenticationConnection *ac, int add, const char *id)
 {
 	char *pin;
-	int ret = -1;
 
 	pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
 	if (pin == NULL)
@@ -198,14 +179,12 @@
 	if (ssh_update_card(ac, add, id, pin)) {
 		fprintf(stderr, "Card %s: %s\n",
 		    add ? "added" : "removed", id);
-		ret = 0;
+		return 0;
 	} else {
 		fprintf(stderr, "Could not %s card: %s\n",
 		    add ? "add" : "remove", id);
-		ret = -1;
+		return -1;
 	}
-	xfree(pin);
-	return ret;
 }
 
 static int
@@ -248,7 +227,7 @@
 {
 	char prompt[100], *p1, *p2;
 	int passok = 1, ret = -1;
-
+ 
 	strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
 	p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
 	if (lock) {
@@ -268,7 +247,7 @@
 		fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
 	memset(p1, 0, strlen(p1));
 	xfree(p1);
-	return (ret);
+	return -1;
 }
 
 static int
@@ -293,10 +272,6 @@
 	fprintf(stderr, "  -L          List public key parameters of all identities.\n");
 	fprintf(stderr, "  -d          Delete identity.\n");
 	fprintf(stderr, "  -D          Delete all identities.\n");
-	fprintf(stderr, "  -x          Lock agent.\n");
-	fprintf(stderr, "  -X          Unlock agent.\n");
-	fprintf(stderr, "  -t life     Set lifetime (in seconds) when adding identities.\n");
-	fprintf(stderr, "  -c          Require confirmation to sign using identities\n");
 #ifdef SMARTCARD
 	fprintf(stderr, "  -s reader   Add key in smartcard reader.\n");
 	fprintf(stderr, "  -e reader   Remove key in smartcard reader.\n");
@@ -320,7 +295,7 @@
 		fprintf(stderr, "Could not open a connection to your authentication agent.\n");
 		exit(2);
 	}
-	while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "lLdDxXe:s:")) != -1) {
 		switch (ch) {
 		case 'l':
 		case 'L':
@@ -334,9 +309,6 @@
 				ret = 1;
 			goto done;
 			break;
-		case 'c':
-			confirm = 1;
-			break;
 		case 'd':
 			deleting = 1;
 			break;
@@ -351,13 +323,6 @@
 		case 'e':
 			deleting = 1;
 			sc_reader_id = optarg;
-			break;
-		case 't':
-			if ((lifetime = convtime(optarg)) == -1) {
-				fprintf(stderr, "Invalid lifetime\n");
-				ret = 1;
-				goto done;
-			}
 			break;
 		default:
 			usage();