Changeset 535 in openpam

Timestamp:

03/31/12 14:55:19 (14 months ago)

Author:

des

Message:

Fix some embarassing typos introduced in the openpam_straddch() cleanup.
Move prototype from "opempam_impl.h" to <security/openpam.h>.
Generate openpam_straddch(3) man page.

Location:

trunk

Files:

• doc/man/Makefile.am (modified) (1 diff)
• include/security/openpam.h (modified) (1 diff)
• lib/openpam_impl.h (modified) (1 diff)
• lib/openpam_straddch.c (modified) (3 diffs)

trunk/doc/man/Makefile.am

@@ -45 +45 @@
         openpam_restore_cred.3 \
         openpam_set_option.3 \
+        openpam_straddch.3 \
         openpam_subst.3 \
         openpam_ttyconv.3 \

trunk/include/security/openpam.h

@@ -158 +158 @@
         size_t *_lenp)
         OPENPAM_NONNULL((1));
+
+int
+openpam_straddch(char **_str,
+    size_t *_sizep,
+    size_t *_lenp,
+    int ch);
 #endif
 

trunk/lib/openpam_impl.h

@@ -144 +144 @@
  * Internal functions
  */
-int              openpam_straddch(char **, size_t *, size_t *, char);
 int              openpam_configure(pam_handle_t *, const char *);
 int              openpam_dispatch(pam_handle_t *, int, int);

trunk/lib/openpam_straddch.c

@@ -47 +47 @@
 
 int
-openpam_straddch(char **str, size_t *size, size_t *len, char ch)
+openpam_straddch(char **str, size_t *size, size_t *len, int ch)
 {
         size_t tmpsize;
@@ -54 +54 @@
         if (*str == NULL) {
                 /* initial allocation */
-                tmpsize = MIN_STR_SIZE
+                tmpsize = MIN_STR_SIZE;
                 if ((tmpstr = malloc(tmpsize)) == NULL) {
                         openpam_log(PAM_LOG_ERROR, "malloc(): %m");
@@ -69 +69 @@
                         return (-1);
                 }
-                size = tmpsize;
+                *size = tmpsize;
                 *str = tmpstr;
         }