Ticket #29: pam_pkcs11-0.6.2-fix-arg-parsing.2.patch

File pam_pkcs11-0.6.2-fix-arg-parsing.2.patch, 2.9 KB (added by halfline, 22 months ago)

Fix pklogin_finder and ls

  • pam_pkcs11-0.6.2/src/pam_pkcs11/pam_config.c 

    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
    old new struct configuration_st *pk_configure( i 
    229229        int i; 
    230230        int res; 
    231231        /* try to find a configuration file entry */ 
    232         for (i = 1; i < argc; i++) { 
     232        for (i = 0; i < argc; i++) { 
    233233            if (strstr(argv[i],"config_file=") ) { 
    234234                configuration.config_file=1+strchr(argv[i],'='); 
    235235                break; 
    … … struct configuration_st *pk_configure( i 
    241241        /* display_config(); */ 
    242242        /* finally parse provided arguments */ 
    243243        /* dont skip argv[0] */ 
    244         for (i = 1; i < argc; i++) { 
     244        for (i = 0; i < argc; i++) { 
    245245           if (strcmp("nullok", argv[i]) == 0) { 
    246246                configuration.nullok = 1; 
    247247                continue; 

  • pam_pkcs11-0.6.2/src/tools/pkcs11_inspect.c 

    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
    old new int main(int argc, const char **argv) { 
    4747    } 
    4848 
    4949  /* call configure routines */ 
    50   configuration = pk_configure(argc,argv); 
     50  configuration = pk_configure(argc - 1, argv + 1); 
    5151  if (!configuration ) { 
    5252        ERR("Error setting configuration parameters"); 
    5353        return 1; 

  • pam_pkcs11-0.6.2/src/tools/pkcs11_listcerts.c 

    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
    old new int main(int argc, const char **argv) { 
    4747    } 
    4848 
    4949  /* call configure routines */ 
    50   configuration = pk_configure(argc,argv); 
     50  configuration = pk_configure(argc - 1, argv + 1); 
    5151  if (!configuration ) { 
    5252        DBG("Error setting configuration parameters"); 
    5353        return 1; 

  • pam_pkcs11-0.6.2/src/tools/pklogin_finder.c 

    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
    old new int main(int argc, const char **argv) { 
    4949    } 
    5050 
    5151  /* call configure routines */ 
    52   configuration = pk_configure(argc,argv); 
     52  configuration = pk_configure(argc - 1, argv + 1); 
    5353  if (!configuration ) { 
    5454        DBG("Error setting configuration parameters"); 
    5555        return 1;