|
1 # |
|
2 # This patch is to fix one spelling error and some message problems in PAM |
|
3 # prompt, so that they will comply to the Solaris message style. |
|
4 # |
|
5 # The authentication spelling error has been already fixed in the latest |
|
6 # upstream source, so there is no need to contribute back this spelling error |
|
7 # fix. We will remove the spelling error change from this patch, when we |
|
8 # upgrade this module to a new release that contains the spelling error fix. |
|
9 # |
|
10 # Changes from smartcard to "smart card" in pam_prompt messages are for |
|
11 # Solaris message style compliance and they are Solaris specific. |
|
12 # |
|
13 --- pam_pkcs11-0.6.8_ORIG/src/pam_pkcs11/pam_pkcs11.c Tue Oct 4 12:22:18 2016 |
|
14 +++ pam_pkcs11-0.6.8_NEW/src/pam_pkcs11/pam_pkcs11.c Thu Oct 27 15:56:06 2016 |
|
15 @@ -199,7 +199,7 @@ |
|
16 char **issuer, **serial; |
|
17 const char *login_token_name = NULL; |
|
18 |
|
19 - pam_prompt(pamh, PAM_TEXT_INFO , NULL, _("Smartcard authentification starts")); |
|
20 + pam_prompt(pamh, PAM_TEXT_INFO , NULL, _("Smart card authentication starts")); |
|
21 |
|
22 /* first of all check whether debugging should be enabled */ |
|
23 for (i = 0; i < argc; i++) |
|
24 @@ -392,7 +392,7 @@ |
|
25 } |
|
26 } else if (user) { |
|
27 if (!configuration->quiet) { |
|
28 - pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2308: No smartcard found")); |
|
29 + pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2308: No smart card found")); |
|
30 sleep(configuration->err_display_time); |
|
31 } |
|
32 |
|
33 @@ -419,7 +419,7 @@ |
|
34 if (rv != 0) { |
|
35 /* user gave us a user id and no smart card go to next module */ |
|
36 if (!configuration->quiet) { |
|
37 - pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2310: No smartcard found")); |
|
38 + pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2310: No smart card found")); |
|
39 sleep(configuration->err_display_time); |
|
40 } |
|
41 |
|
42 @@ -495,7 +495,7 @@ |
|
43 pam_syslog(pamh, LOG_ERR, |
|
44 "password length is zero but the 'nullok' argument was not defined."); |
|
45 if (!configuration->quiet) { |
|
46 - pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2318: Empty smartcard PIN not allowed.")); |
|
47 + pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2318: Empty smart card PIN not allowed.")); |
|
48 sleep(configuration->err_display_time); |
|
49 } |
|
50 return PAM_AUTH_ERR; |
|
51 @@ -523,7 +523,7 @@ |
|
52 ERR1("open_pkcs11_login() failed: %s", get_error()); |
|
53 if (!configuration->quiet) { |
|
54 pam_syslog(pamh, LOG_ERR, "open_pkcs11_login() failed: %s", get_error()); |
|
55 - pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2320: Wrong smartcard PIN")); |
|
56 + pam_prompt(pamh, PAM_ERROR_MSG , NULL, _("Error 2320: Wrong smart card PIN")); |
|
57 sleep(configuration->err_display_time); |
|
58 } |
|
59 goto auth_failed_nopw; |