Changeset 101 in openpam

Timestamp:

Apr 6, 2002, 5:17:44 PM (19 years ago)

Author:

Dag-Erling Smørgrav

Message:

Plug memory leak, reduce differences between these very similar
functions, and {add,tweak} documentation.

Sponsored by: DARPA, NAI Labs

Location:

trunk/lib

Files:

• pam_get_authtok.c (modified) (3 diffs)
• pam_get_user.c (modified) (5 diffs)

trunk/lib/pam_get_authtok.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#13 $
+ * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#14 $
  */
 
 #include <sys/param.h>
+
+#include <stdlib.h>
 
 #include <security/pam_appl.h>
@@ -96 +98 @@
         if (r != PAM_SUCCESS)
                 return (r);
-        *authtok = resp;
-        return (pam_set_item(pamh, item, *authtok));
+        r = pam_set_item(pamh, pitem, resp);
+        free(resp);
+        if (r != PAM_SUCCESS)
+                return (r);
+        return (pam_get_item(pamh, pitem, (const void **)authtok));
 }
 
@@ -125 +130 @@
  *
  * The =prompt argument specifies a prompt to use if no token is cached.
- * If =NULL, the =PAM_AUTHTOK_PROMPT or =PAM_OLDAUTHTOK_PROMPT item, as
- * appropriate, will be used.  If that item is also =NULL, a hardcoded
+ * If it is =NULL, the =PAM_AUTHTOK_PROMPT or =PAM_OLDAUTHTOK_PROMPT item,
+ * as appropriate, will be used.  If that item is also =NULL, a hardcoded
  * default prompt will be used.
  *
  * >pam_get_item
+ * >pam_get_user
  */

trunk/lib/pam_get_user.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_user.c#10 $
+ * $P4: //depot/projects/openpam/lib/pam_get_user.c#11 $
  */
 
 #include <sys/param.h>
+
+#include <stdlib.h>
 
 #include <security/pam_appl.h>
@@ -41 +43 @@
 
 #include "openpam_impl.h"
+
+const char user_prompt[] = "Login:";
 
 /*
@@ -54 +58 @@
         const char *prompt)
 {
-        char *p, *resp;
+        char *resp;
         int r;
 
@@ -64 +68 @@
                 return (PAM_SUCCESS);
         if (prompt == NULL) {
-                if (pam_get_item(pamh, PAM_USER_PROMPT,
-                    (const void **)&p) != PAM_SUCCESS || p == NULL)
-                        prompt = "Login: ";
+                r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt);
+                if (r != PAM_SUCCESS || prompt == NULL)
+                        prompt = user_prompt;
         }
-        r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp,
-            "%s", prompt ? prompt : p);
+        r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, "%s", prompt);
         if (r != PAM_SUCCESS)
                 return (r);
-        *user = resp;
-        return (pam_set_item(pamh, PAM_USER, *user));
+        r = pam_set_item(pamh, PAM_USER, resp);
+        free(resp);
+        if (r != PAM_SUCCESS)
+                return (r);
+        return (pam_get_item(pamh, PAM_USER, (const void **)user));
 }
 
@@ -84 +90 @@
  *      !PAM_SYMBOL_ERR
  */
+
+/**
+ * The =pam_get_user function returns the name of the target user, as
+ * specified to =pam_start.  If no user was specified, nor set using
+ * =pam_set_item, =pam_get_user will prompt for a user name.  Either way,
+ * a pointer to the user name is stored in the location pointed to by the
+ * =user argument.
+
+ * The =prompt argument specifies a prompt to use if no user name is
+ * cached.  If it is =NULL, the =PAM_USER_PROMPT will be used.  If that
+ * item is also =NULL, a hardcoded default prompt will be used.
+ *
+ * >pam_get_item
+ * >pam_get_authtok
+ */