diff -up pam_pkcs11-0.6.2/src/pam_pkcs11/pam_config.c.fix-arg-parsing pam_pkcs11-0.6.2/src/pam_pkcs11/pam_config.c
--- pam_pkcs11-0.6.2/src/pam_pkcs11/pam_config.c.fix-arg-parsing	2008-12-31 07:13:39.000000000 -0500
+++ pam_pkcs11-0.6.2/src/pam_pkcs11/pam_config.c	2010-08-09 20:26:28.371970550 -0400
@@ -229,7 +229,7 @@ struct configuration_st *pk_configure( i
 	int i;
 	int res;
 	/* try to find a configuration file entry */
-	for (i = 1; i < argc; i++) {
+	for (i = 0; i < argc; i++) {
 	    if (strstr(argv[i],"config_file=") ) {
 		configuration.config_file=1+strchr(argv[i],'=');
 		break;
@@ -241,7 +241,7 @@ struct configuration_st *pk_configure( i
 	/* display_config(); */
 	/* finally parse provided arguments */
 	/* dont skip argv[0] */
-	for (i = 1; i < argc; i++) {
+	for (i = 0; i < argc; i++) {
 	   if (strcmp("nullok", argv[i]) == 0) {
 		configuration.nullok = 1;
 		continue;
diff -up pam_pkcs11-0.6.2/src/tools/card_eventmgr.c.fix-arg-parsing pam_pkcs11-0.6.2/src/tools/card_eventmgr.c
diff -up pam_pkcs11-0.6.2/src/tools/pkcs11_eventmgr.c.fix-arg-parsing pam_pkcs11-0.6.2/src/tools/pkcs11_eventmgr.c
diff -up pam_pkcs11-0.6.2/src/tools/pkcs11_inspect.c.fix-arg-parsing pam_pkcs11-0.6.2/src/tools/pkcs11_inspect.c
--- pam_pkcs11-0.6.2/src/tools/pkcs11_inspect.c.fix-arg-parsing	2008-10-11 15:14:38.000000000 -0400
+++ pam_pkcs11-0.6.2/src/tools/pkcs11_inspect.c	2010-08-09 20:26:28.371970550 -0400
@@ -47,7 +47,7 @@ int main(int argc, const char **argv) {
     }
 
   /* call configure routines */
-  configuration = pk_configure(argc,argv);
+  configuration = pk_configure(argc - 1, argv + 1);
   if (!configuration ) {
 	ERR("Error setting configuration parameters");
 	return 1;
diff -up pam_pkcs11-0.6.2/src/tools/pkcs11_listcerts.c.fix-arg-parsing pam_pkcs11-0.6.2/src/tools/pkcs11_listcerts.c
--- pam_pkcs11-0.6.2/src/tools/pkcs11_listcerts.c.fix-arg-parsing	2010-08-12 09:19:09.776750524 -0400
+++ pam_pkcs11-0.6.2/src/tools/pkcs11_listcerts.c	2010-08-12 09:20:00.039959957 -0400
@@ -47,7 +47,7 @@ int main(int argc, const char **argv) {
     }
 
   /* call configure routines */
-  configuration = pk_configure(argc,argv);
+  configuration = pk_configure(argc - 1, argv + 1);
   if (!configuration ) {
 	DBG("Error setting configuration parameters");
 	return 1;
diff -up pam_pkcs11-0.6.2/src/tools/pkcs11_setup.c.fix-arg-parsing pam_pkcs11-0.6.2/src/tools/pkcs11_setup.c
diff -up pam_pkcs11-0.6.2/src/tools/pklogin_finder.c.fix-arg-parsing pam_pkcs11-0.6.2/src/tools/pklogin_finder.c
--- pam_pkcs11-0.6.2/src/tools/pklogin_finder.c.fix-arg-parsing	2010-08-12 09:19:09.779769837 -0400
+++ pam_pkcs11-0.6.2/src/tools/pklogin_finder.c	2010-08-12 09:20:12.129141465 -0400
@@ -49,7 +49,7 @@ int main(int argc, const char **argv) {
     }
 
   /* call configure routines */
-  configuration = pk_configure(argc,argv);
+  configuration = pk_configure(argc - 1, argv + 1);
   if (!configuration ) {
 	DBG("Error setting configuration parameters");
 	return 1;