Some defaults I_ defines got renamed.

diff --git a/auth/aix_auth.c b/auth/aix_auth.c
index 3e8981ebf0dfa4ed1ebf299b317a6b3a62481cad..39afbf58d9fa1a5894a5fe67871a1268defd07e9 100644 (file)
--- a/auth/aix_auth.c
+++ b/auth/aix_auth.c
@@ -67,7 +67,7 @@ aixauth_verify(pw, prompt, auth)
     char *message, *pass;
     int reenter = 1;
 
-    pass = tgetpass(prompt, def_ival(I_PW_TIMEOUT) * 60, tgetpass_flags);
+    pass = tgetpass(prompt, def_ival(I_PASSWD_TIMEOUT) * 60, tgetpass_flags);
     if (authenticate(pw->pw_name, pass, &reenter, &message) == 0)
        return(AUTH_SUCCESS);
     else

diff --git a/auth/bsdauth.c b/auth/bsdauth.c
index b6e24067d190f63c17235ba5298a1c160fe896ca..cfd3f9da607a8d1bbcd01c991d98084b4d78da23 100644 (file)
--- a/auth/bsdauth.c
+++ b/auth/bsdauth.c
@@ -122,9 +122,9 @@ bsdauth_verify(pw, prompt, auth)
      * S/Key.
      */
     if ((s = auth_challenge(as)) == NULL) {
-       pass = tgetpass(prompt, def_ival(I_PW_TIMEOUT) * 60, tgetpass_flags);
+       pass = tgetpass(prompt, def_ival(I_PASSWD_TIMEOUT) * 60, tgetpass_flags);
     } else {
-       pass = tgetpass(s, def_ival(I_PW_TIMEOUT) * 60, tgetpass_flags);
+       pass = tgetpass(s, def_ival(I_PASSWD_TIMEOUT) * 60, tgetpass_flags);
        if (!pass || *pass == '\0') {
            if ((prompt = strrchr(s, '\n')))
                prompt++;
@@ -139,7 +139,7 @@ bsdauth_verify(pw, prompt, auth)
            while (isspace(prompt[len]) || prompt[len] == ':')
                prompt[len--] = '\0';
            easprintf(&s, "%s [echo on]: ", prompt);
-           pass = tgetpass(s, def_ival(I_PW_TIMEOUT) * 60,
+           pass = tgetpass(s, def_ival(I_PASSWD_TIMEOUT) * 60,
                tgetpass_flags | TGP_ECHO);
            free(s);
        }

diff --git a/auth/fwtk.c b/auth/fwtk.c
index 3c7623749508f04b726e99058afdde2cac933f03..8d395dd8bd17a70d2204df79014edabfd92d9f65 100644 (file)
--- a/auth/fwtk.c
+++ b/auth/fwtk.c
@@ -118,13 +118,14 @@ fwtk_verify(pw, prompt, auth)
     /* Get the password/response from the user. */
     if (strncmp(resp, "challenge ", 10) == 0) {
        (void) snprintf(buf, sizeof(buf), "%s\nResponse: ", &resp[10]);
-       pass = tgetpass(buf, def_ival(I_PW_TIMEOUT) * 60, tgetpass_flags);
+       pass = tgetpass(buf, def_ival(I_PASSWD_TIMEOUT) * 60, tgetpass_flags);
        if (!pass || *pass == '\0') {
-           pass = tgetpass("Response [echo on]: ", def_ival(I_PW_TIMEOUT) * 60,
-               tgetpass_flags | TGP_ECHO);
+           pass = tgetpass("Response [echo on]: ",
+               def_ival(I_PASSWD_TIMEOUT) * 60, tgetpass_flags | TGP_ECHO);
        }
     } else if (strncmp(resp, "password", 8) == 0) {
-       pass = tgetpass(prompt, def_ival(I_PW_TIMEOUT) * 60, tgetpass_flags);
+       pass = tgetpass(prompt, def_ival(I_PASSWD_TIMEOUT) * 60,
+           tgetpass_flags);
     } else {
        (void) fprintf(stderr, "%s: %s\n", Argv[0], resp);
        return(AUTH_FATAL);

diff --git a/auth/pam.c b/auth/pam.c
index 01f455b41c699833998e42a672f37e7f9a265c18..98cfa3d62f7581ae617ad6a9c0a096518ed8a2dd 100644 (file)
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -155,7 +155,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
                    p = pm->msg;
                /* Read the password. */
                pr->resp = estrdup((char *) tgetpass(p,
-                   def_ival(I_PW_TIMEOUT) * 60, tgetpass_flags));
+                   def_ival(I_PASSWD_TIMEOUT) * 60, tgetpass_flags));
                if (*pr->resp == '\0')
                    nil_pw = 1;         /* empty password */
                break;

diff --git a/auth/sia.c b/auth/sia.c
index 8c80c1a3b9a2b7888aff66458b8ccf49bdb11b95..5d9eba38c16cfad2af7ccbcf54f365bbd3992026 100644 (file)
--- a/auth/sia.c
+++ b/auth/sia.c
@@ -80,8 +80,8 @@ sudo_collect(timeout, rendition, title, nprompts, prompts)
     switch (rendition) {
        case SIAFORM:
        case SIAONELINER:
-           if (timeout <= 0 || timeout > def_ival(I_PW_TIMEOUT) * 60)
-               timeout = def_ival(I_PW_TIMEOUT) * 60;
+           if (timeout <= 0 || timeout > def_ival(I_PASSWD_TIMEOUT) * 60)
+               timeout = def_ival(I_PASSWD_TIMEOUT) * 60;
            /*
             * Substitute custom prompt if a) the sudo prompt is not "Password:"
             * and b) the SIA prompt is "Password:" (so we know it is safe).

diff --git a/auth/sudo_auth.c b/auth/sudo_auth.c
index 07a4ed7d8d4c790ee1212c691db579de6ca43cca..ce8614b9a43b16369ea9d63ca56e4728c3538d82 100644 (file)
--- a/auth/sudo_auth.c
+++ b/auth/sudo_auth.c
@@ -99,7 +99,7 @@ verify_user(pw, prompt)
     struct passwd *pw;
     char *prompt;
 {
-    short counter = def_ival(I_PW_TRIES) + 1;
+    short counter = def_ival(I_PASSWD_TRIES) + 1;
     short success = AUTH_FAILURE;
     short status;
     char *p;
@@ -156,7 +156,7 @@ verify_user(pw, prompt)
 #ifdef AUTH_STANDALONE
        p = prompt;
 #else
-       p = (char *) tgetpass(prompt, def_ival(I_PW_TIMEOUT) * 60,
+       p = (char *) tgetpass(prompt, def_ival(I_PASSWD_TIMEOUT) * 60,
            tgetpass_flags);
        if (!p || *p == '\0')
            nil_pw = 1;
@@ -184,7 +184,7 @@ verify_user(pw, prompt)
 
        /* Exit loop on nil password, but give it a chance to match first. */
        if (nil_pw) {
-           if (counter == def_ival(I_PW_TRIES))
+           if (counter == def_ival(I_PASSWD_TRIES))
                exit(1);
            else
                break;
@@ -214,8 +214,8 @@ cleanup:
            return;
        case AUTH_FAILURE:
            log_error(NO_MAIL, "%d incorrect password attempt%s",
-               def_ival(I_PW_TRIES) - counter,
-               (def_ival(I_PW_TRIES) - counter == 1) ? "" : "s");
+               def_ival(I_PASSWD_TRIES) - counter,
+               (def_ival(I_PASSWD_TRIES) - counter == 1) ? "" : "s");
        case AUTH_FATAL:
            exit(1);
     }
@@ -231,7 +231,7 @@ pass_warn(fp)
        (void) fprintf(fp, "%s\n", INSULT);
     else
 #endif
-       (void) fprintf(fp, "%s\n", def_str(I_BADPASS_MSG));
+       (void) fprintf(fp, "%s\n", def_str(I_BADPASS_MESSAGE));
 }
 
 void