Changeset 441

Timestamp:

08/12/10 21:45:03 (18 months ago)

Author:

ludovic.rousseau

Message:

Revert changeset 301 parsing arguments in pam_config.c but skip the
first argument in command line tools.

Thanks to halfline for the patch. Closes ticket #29

Location:

trunk/src

Files:

• pam_pkcs11/pam_config.c (modified) (2 diffs)
• tools/pkcs11_inspect.c (modified) (1 diff)
• tools/pkcs11_listcerts.c (modified) (1 diff)
• tools/pklogin_finder.c (modified) (1 diff)

trunk/src/pam_pkcs11/pam_config.c

@@ -237 +237 @@
         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],'=');
@@ -251 +251 @@
         /* 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;

trunk/src/tools/pkcs11_inspect.c

@@ -48 +48 @@
 
   /* call configure routines */
-  configuration = pk_configure(argc,argv);
+  configuration = pk_configure(argc - 1, argv + 1);
   if (!configuration ) {
         ERR("Error setting configuration parameters");

trunk/src/tools/pkcs11_listcerts.c

@@ -48 +48 @@
 
   /* call configure routines */
-  configuration = pk_configure(argc,argv);
+  configuration = pk_configure(argc - 1, argv + 1);
   if (!configuration ) {
         DBG("Error setting configuration parameters");

trunk/src/tools/pklogin_finder.c

@@ -50 +50 @@
 
   /* call configure routines */
-  configuration = pk_configure(argc,argv);
+  configuration = pk_configure(argc - 1, argv + 1);
   if (!configuration ) {
         DBG("Error setting configuration parameters");