X-Git-Url: http://www.average.org/gitweb/?p=pam_pcsc_cr.git;a=blobdiff_plain;f=pam_cr_setup.c;h=612747ab80913e03d9c5e2cc0e49323b32d79dcf;hp=af4e11626ff394b3a21fd414a3925e6f78eecd06;hb=eaaae6374b2e8949fd2d13b45e3b9cbdb95f5299;hpb=e3806a9acf7e6eea70bfd4641e7602d1f3518ac5

diff --git a/pam_cr_setup.c b/pam_cr_setup.c
index af4e116..612747a 100644
--- a/pam_cr_setup.c
+++ b/pam_cr_setup.c
@@ -70,7 +70,6 @@ static void usage(const char * const cmd)
 		"    -f template       - template for auth state filepath\n"
 		"    -a secret | -A file-with-secret | -A -\n"
 		"                      - 40-character hexadecimal secret\n"
-		"    -s token-serial   - public I.D. of the token\n"
 		"    -n nonce          - initial nonce\n"
 		"    -l payload        - keyring unlock password\n"
 		"    -p password       - login password\n"
@@ -89,12 +88,11 @@ int main(int argc, char *argv[])
 	unsigned char bsecret[20];
 	unsigned char *secret = NULL;
 	int i;
-	char *tokenid = NULL;
 	char *userid = getlogin();
 	char *payload = NULL;
 	char *password = "";
 
-	while ((c = getopt(argc, argv, "ho:f:a:A:s:n:l:p:v")) != -1)
+	while ((c = getopt(argc, argv, "ho:f:a:A:n:l:p:v")) != -1)
 	    switch (c) {
 	case 'h':
 		usage(argv[0]);
@@ -124,9 +122,6 @@ int main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		}
 		break;
-	case 's':
-		tokenid = optarg;
-		break;
 	case 'n':
 		mynonce = optarg;
 		break;
@@ -192,7 +187,7 @@ int main(int argc, char *argv[])
 			sscanf(hsecret + i * 2, "%2hhx", &bsecret[i]);
 		secret = bsecret;
 	}
-	ao = authfile(tokenid, userid, password, update_nonce,
+	ao = authfile(userid, password, update_nonce,
 			secret, secret ? sizeof(bsecret) : 0,
 			(unsigned char *)payload, payload ? strlen(payload) : 0,
 			token_key);