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