Changeset 164 in openpam

Timestamp:

06/30/02 23:11:38 (11 years ago)

Author:

des

Message:

Add the PAM_REPOSITORY item (from Solaris 9).

Sponsored by: DARPA, NAI Labs

Location:

trunk

Files:

• include/security/pam_constants.h (modified) (2 diffs)
• lib/pam_get_item.c (modified) (2 diffs)
• lib/pam_set_item.c (modified) (5 diffs)

trunk/include/security/pam_constants.h

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/pam_constants.h#16 $
+ * $P4: //depot/projects/openpam/include/security/pam_constants.h#17 $
  */
 
@@ -123 +123 @@
         PAM_AUTHTOK_PROMPT              =  10,          /* OpenPAM extension */
         PAM_OLDAUTHTOK_PROMPT           =  11,          /* OpenPAM extension */
+        PAM_REPOSITORY                  =  12,
         PAM_NUM_ITEMS                                   /* OpenPAM extension */
 };

trunk/lib/pam_get_item.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_item.c#12 $
+ * $P4: //depot/projects/openpam/lib/pam_get_item.c#13 $
  */
 
@@ -68 +68 @@
         case PAM_AUTHTOK_PROMPT:
         case PAM_OLDAUTHTOK_PROMPT:
+        case PAM_REPOSITORY:
                 *item = pamh->item[item_type];
                 return (PAM_SUCCESS);

trunk/lib/pam_set_item.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_set_item.c#14 $
+ * $P4: //depot/projects/openpam/lib/pam_set_item.c#15 $
  */
 
@@ -57 +57 @@
 {
         void **slot, *tmp;
-        size_t size;
+        size_t nsize, osize;
 
         if (pamh == NULL)
@@ -63 +63 @@
 
         slot = &pamh->item[item_type];
-        tmp = NULL;
         switch (item_type) {
         case PAM_SERVICE:
@@ -75 +74 @@
         case PAM_AUTHTOK_PROMPT:
         case PAM_OLDAUTHTOK_PROMPT:
+                if (item != NULL)
+                        nsize = strlen(item) + 1;
                 if (*slot != NULL)
-                        size = strlen(*slot) + 1;
-                if (item != NULL)
-                        if ((tmp = strdup(item)) == NULL)
-                                return (PAM_BUF_ERR);
+                        osize = strlen(*slot) + 1;
+                break;
+        case PAM_REPOSITORY:
+                osize = nsize = sizeof(struct pam_repository);
                 break;
         case PAM_CONV:
-                size = sizeof(struct pam_conv);
-                if (item != NULL) {
-                        if ((tmp = malloc(size)) == NULL)
-                                return (PAM_BUF_ERR);
-                        memcpy(tmp, item, sizeof(struct pam_conv));
-                }
+                osize = nsize = sizeof(struct pam_conv);
                 break;
         default:
@@ -93 +89 @@
         }
         if (*slot != NULL) {
-                memset(*slot, 0xd0, size);
+                memset(*slot, 0xd0, osize);
                 free(*slot);
+        }
+        if (item != NULL) {
+                if ((tmp = malloc(nsize)) == NULL)
+                        return (PAM_BUF_ERR);
+                memcpy(tmp, item, nsize);
+        } else {
+                tmp = NULL;
         }
         *slot = tmp;