Changeset 24 in openpam

Timestamp:

Feb 4, 2002, 2:53:46 PM (19 years ago)

Author:

Dag-Erling Smørgrav

Message:

Circumvent constness issues. OpenPAM is now WARNS4-clean.

Sponsored by: DARPA, NAI Labs

Location:

trunk/lib

Files:

• pam_get_authtok.c (modified) (2 diffs)
• pam_get_user.c (modified) (2 diffs)

trunk/lib/pam_get_authtok.c

@@ -52 +52 @@
         const char *prompt)
 {
+        char *p;
         int r;
 
@@ -60 +61 @@
         if (r == PAM_SUCCESS)
                 return (PAM_SUCCESS);
-        if (prompt == NULL)
-                pam_get_item(pamh, PAM_AUTHTOK_PROMPT, (void **)&prompt);
-        if (prompt == NULL)
-                prompt = "Password:";
-        if ((r = pam_prompt(pamh, authtok, 0, "%s", prompt)) != PAM_SUCCESS)
+        if (prompt == NULL) {
+                if (pam_get_item(pamh, PAM_AUTHTOK_PROMPT, (void **)&p) !=
+                    PAM_SUCCESS || p == NULL)
+                        prompt = "Password:";
+        }
+        r = pam_prompt(pamh, authtok, 0, "%s", prompt ? prompt : p);
+        if (r != PAM_SUCCESS)
                 return (r);
         return (pam_set_item(pamh, PAM_AUTHTOK, *authtok));

trunk/lib/pam_get_user.c

@@ -53 +53 @@
         const char *prompt)
 {
+        char *p;
         int r;
 
@@ -58 +59 @@
                 return (PAM_SYSTEM_ERR);
 
-        if ((r = pam_get_item(pamh, PAM_USER, (void **)user)) == PAM_SUCCESS)
+        r = pam_get_item(pamh, PAM_USER, (void **)user);
+        if (r == PAM_SUCCESS)
                 return (PAM_SUCCESS);
-        if (prompt == NULL)
-                pam_get_item(pamh, PAM_USER_PROMPT, (void **)&prompt);
-        if (prompt == NULL)
-                prompt = "Login: ";
-        if ((r = pam_prompt(pamh, user, 0, "%s", prompt)) != PAM_SUCCESS)
+        if (prompt == NULL) {
+                if (pam_get_item(pamh, PAM_USER_PROMPT, (void **)&p) !=
+                    PAM_SUCCESS || p == NULL)
+                        prompt = "Login: ";
+        }
+        r = pam_prompt(pamh, user, 0, "%s", prompt ? prompt : p);
+        if (r != PAM_SUCCESS)
                 return (r);
         return (pam_set_item(pamh, PAM_USER, *user));