Changeset 38 in openpam

Timestamp:

Feb 6, 2002, 4:03:39 PM (17 years ago)

Author:

Dag-Erling Smørgrav

Message:

Constify.

Sponsored by: DARPA, NAI Labs

Location:

trunk

Files:

• include/security/pam_appl.h (modified) (2 diffs)
• lib/pam_get_authtok.c (modified) (2 diffs)
• lib/pam_get_item.c (modified) (1 diff)

trunk/include/security/pam_appl.h

@@ -73 +73 @@
 pam_get_item(pam_handle_t *_pamh,
         int _item_type,
-        void **_item);
+        const void **_item);
 
 int
 pam_get_user(pam_handle_t *_pamh,
-        char **_user,
+        const char **_user,
         const char *_prompt);
 
@@ -132 +132 @@
 int
 pam_get_authtok(pam_handle_t *_pamh,
-        char **_authtok,
+        const char **_authtok,
         const char *_prompt);
 

trunk/lib/pam_get_authtok.c

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

trunk/lib/pam_get_item.c

@@ -51 +51 @@
 pam_get_item(pam_handle_t *pamh,
         int item_type,
-        void **item)
+        const void **item)
 {
         if (pamh == NULL)