Changeset 547 in openpam

Timestamp:

04/01/12 15:01:21 (14 months ago)

Author:

des

Message:

Add an openpam_straddch() function that appends a character to a
string, reallocating the string if necessary.

Add an openpam_readword() function that reads a single word from a
file according to the usual shell quoting rules.

Add an openpam_readlinev() function that uses openpam_readword() to
read an entire line and return a list of the words it contained.

Rewrite openpam_parse_chain() using openpam_readlinev(), which greatly
simplifies the code and ensures correct parsing of module option.

Thanks to Maëlle Lesage for pointing out the issue and writing an
early version of what became the main loop in openpam_readword().

Location:

trunk

Files:

• CREDITS (modified) (1 diff)
• doc/man (modified) (1 prop)
• doc/man/Makefile.am (modified) (1 diff)
• include/security/openpam.h (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• lib/openpam_configure.c (modified) (14 diffs)
• lib/openpam_ctype.h (added)
• lib/openpam_impl.h (modified) (1 diff)
• lib/openpam_load.c (modified) (1 diff)
• lib/openpam_readline.c (modified) (5 diffs)
• lib/openpam_readlinev.c (added)
• lib/openpam_readword.c (added)
• lib/openpam_straddch.c (modified) (5 diffs)

trunk/CREDITS

@@ -28 +28 @@
         Juli Mallett <jmallett@freebsd.org>
         Jörg Sonnenberger <joerg@britannica.bec.de>
+        Maëlle Lesage <lesage.maelle@gmail.com>
         Mark Murray <markm@freebsd.org>
         Matthias Drochner <drochner@netbsd.org>

trunk/doc/man

@@ -9 +9 @@
 openpam_nullconv.3
 openpam_readline.3
+openpam_readlinev.3
+openpam_readword.3
 openpam_restore_cred.3
 openpam_set_option.3
+openpam_straddch.3
 openpam_subst.3
 openpam_ttyconv.3

@@ -9 +9 @@
 openpam_nullconv.3
 openpam_readline.3
+openpam_readlinev.3
+openpam_readword.3
 openpam_restore_cred.3
 openpam_set_option.3
+openpam_straddch.3
 openpam_subst.3
 openpam_ttyconv.3

trunk/doc/man/Makefile.am

@@ -43 +43 @@
         openpam_nullconv.3 \
         openpam_readline.3 \
+        openpam_readlinev.3 \
+        openpam_readword.3 \
         openpam_restore_cred.3 \
         openpam_set_option.3 \

trunk/include/security/openpam.h

@@ -159 +159 @@
         OPENPAM_NONNULL((1));
 
+char **
+openpam_readlinev(FILE *_f,
+        int *_lineno,
+        int *_lenp)
+        OPENPAM_NONNULL((1));
+
+char *
+openpam_readword(FILE *_f,
+        int *_lineno,
+        size_t *_lenp)
+        OPENPAM_NONNULL((1));
+#endif
+
 int
 openpam_straddch(char **_str,
-    size_t *_sizep,
-    size_t *_lenp,
-    int ch);
-#endif
+        size_t *_sizep,
+        size_t *_lenp,
+        int ch)
+        OPENPAM_NONNULL((1));
 
 /*

trunk/lib/Makefile.am

@@ -29 +29 @@
         openpam_nullconv.c \
         openpam_readline.c \
+        openpam_readlinev.c \
+        openpam_readword.c \
         openpam_restore_cred.c \
         openpam_set_option.c \

trunk/lib/openpam_configure.c

@@ -1 +1 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2012 Dag-Erling Smørgrav
  * All rights reserved.
  *
@@ -51 +51 @@
 
 #include "openpam_impl.h"
+#include "openpam_ctype.h"
 #include "openpam_strlcmp.h"
 
@@ -56 +57 @@
 
 /*
- * Evaluates to non-zero if the argument is a linear whitespace character.
- */
-#define is_lws(ch)                              \
-        (ch == ' ' || ch == '\t')
-
-/*
- * Evaluates to non-zero if the argument is a printable ASCII character.
- * Assumes that the execution character set is a superset of ASCII.
- */
-#define is_p(ch) \
-        (ch >= '!' && ch <= '~')
-
-/*
- * Returns non-zero if the argument belongs to the POSIX Portable Filename
- * Character Set.  Assumes that the execution character set is a superset
- * of ASCII.
- */
-#define is_pfcs(ch)                             \
-        ((ch >= '0' && ch <= '9') ||            \
-         (ch >= 'A' && ch <= 'Z') ||            \
-         (ch >= 'a' && ch <= 'z') ||            \
-         ch == '.' || ch == '_' || ch == '-')
-
-/*
- * Parse the service name.
- *
- * Returns the length of the service name, or 0 if the end of the string
- * was reached or a disallowed non-whitespace character was encountered.
- *
- * If parse_service_name() is successful, it updates *service to point to
- * the first character of the service name and *line to point one
- * character past the end.  If it reaches the end of the string, it
- * updates *line to point to the terminating NUL character and leaves
- * *service unmodified.  In all other cases, it leaves both *line and
- * *service unmodified.
- *
- * Allowed characters are all characters in the POSIX portable filename
- * character set.
+ * Validate a service name.
+ *
+ * Returns a non-zero value if the argument points to a NUL-terminated
+ * string consisting entirely of characters in the POSIX portable filename
+ * character set, excluding the path separator character.
  */
 static int
-parse_service_name(char **line, char **service)
-{
-        char *b, *e;
-
-        for (b = *line; *b && is_lws(*b); ++b)
-                /* nothing */ ;
-        if (!*b) {
-                *line = b;
-                return (0);
-        }
-        for (e = b; *e && !is_lws(*e); ++e)
-                if (!is_pfcs(*e))
+valid_service_name(const char *name)
+{
+        const char *p;
+
+        for (p = name; *p != '\0'; ++p)
+                if (!is_pfcs(*p))
                         return (0);
-        if (e == b)
-                return (0);
-        *line = e;
-        *service = b;
-        return (e - b);
+        return (1);
 }
 
@@ -119 +77 @@
  * Parse the facility name.
  *
- * Returns the corresponding pam_facility_t value, or -1 if the end of the
- * string was reached, a disallowed non-whitespace character was
- * encountered, or the first word was not a recognized facility name.
- *
- * If parse_facility_name() is successful, it updates *line to point one
- * character past the end of the facility name.  If it reaches the end of
- * the string, it updates *line to point to the terminating NUL character.
- * In all other cases, it leaves *line unmodified.
+ * Returns the corresponding pam_facility_t value, or -1 if the argument
+ * is not a valid facility name.
  */
 static pam_facility_t
-parse_facility_name(char **line)
-{
-        char *b, *e;
+parse_facility_name(const char *name)
+{
         int i;
 
-        for (b = *line; *b && is_lws(*b); ++b)
-                /* nothing */ ;
-        if (!*b) {
-                *line = b;
-                return ((pam_facility_t)-1);
-        }
-        for (e = b; *e && !is_lws(*e); ++e)
-                /* nothing */ ;
-        if (e == b)
-                return ((pam_facility_t)-1);
         for (i = 0; i < PAM_NUM_FACILITIES; ++i)
-                if (strlcmp(pam_facility_name[i], b, e - b) == 0)
-                        break;
-        if (i == PAM_NUM_FACILITIES)
-                return ((pam_facility_t)-1);
-        *line = e;
-        return (i);
-}
-
-/*
- * Parse the word "include".
- *
- * If the next word on the line is "include", parse_include() updates
- * *line to point one character past "include" and returns 1.  Otherwise,
- * it leaves *line unmodified and returns 0.
+                if (strcmp(pam_facility_name[i], name) == 0)
+                        return (i);
+        return ((pam_facility_t)-1);
+}
+
+/*
+ * Parse the control flag.
+ *
+ * Returns the corresponding pam_control_t value, or -1 if the argument is
+ * not a valid control flag name.
+ */
+static pam_control_t
+parse_control_flag(const char *name)
+{
+        int i;
+
+        for (i = 0; i < PAM_NUM_CONTROL_FLAGS; ++i)
+                if (strcmp(pam_control_flag_name[i], name) == 0)
+                        return (i);
+        return ((pam_control_t)-1);
+}
+
+/*
+ * Validate a file name.
+ *
+ * Returns a non-zero value if the argument points to a NUL-terminated
+ * string consisting entirely of characters in the POSIX portable filename
+ * character set, including the path separator character.
  */
 static int
-parse_include(char **line)
-{
-        char *b, *e;
-
-        for (b = *line; *b && is_lws(*b); ++b)
-                /* nothing */ ;
-        if (!*b) {
-                *line = b;
-                return (-1);
-        }
-        for (e = b; *e && !is_lws(*e); ++e)
-                /* nothing */ ;
-        if (e == b)
-                return (0);
-        if (strlcmp("include", b, e - b) != 0)
-                return (0);
-        *line = e;
+valid_filename(const char *name)
+{
+        const char *p;
+
+        for (p = name; *p != '\0'; ++p)
+                if (!is_pfcs(*p) && *p != '/')
+                        return (0);
         return (1);
-}
-
-/*
- * Parse the control flag.
- *
- * Returns the corresponding pam_control_t value, or -1 if the end of the
- * string was reached, a disallowed non-whitespace character was
- * encountered, or the first word was not a recognized control flag.
- *
- * If parse_control_flag() is successful, it updates *line to point one
- * character past the end of the control flag.  If it reaches the end of
- * the string, it updates *line to point to the terminating NUL character.
- * In all other cases, it leaves *line unmodified.
- */
-static pam_control_t
-parse_control_flag(char **line)
-{
-        char *b, *e;
-        int i;
-
-        for (b = *line; *b && is_lws(*b); ++b)
-                /* nothing */ ;
-        if (!*b) {
-                *line = b;
-                return ((pam_control_t)-1);
-        }
-        for (e = b; *e && !is_lws(*e); ++e)
-                /* nothing */ ;
-        if (e == b)
-                return ((pam_control_t)-1);
-        for (i = 0; i < PAM_NUM_CONTROL_FLAGS; ++i)
-                if (strlcmp(pam_control_flag_name[i], b, e - b) == 0)
-                        break;
-        if (i == PAM_NUM_CONTROL_FLAGS)
-                return ((pam_control_t)-1);
-        *line = e;
-        return (i);
-}
-
-/*
- * Parse a file name.
- *
- * Returns the length of the file name, or 0 if the end of the string was
- * reached or a disallowed non-whitespace character was encountered.
- *
- * If parse_filename() is successful, it updates *filename to point to the
- * first character of the filename and *line to point one character past
- * the end.  If it reaches the end of the string, it updates *line to
- * point to the terminating NUL character and leaves *filename unmodified.
- * In all other cases, it leaves both *line and *filename unmodified.
- *
- * Allowed characters are all characters in the POSIX portable filename
- * character set, plus the path separator (forward slash).
- */
-static int
-parse_filename(char **line, char **filename)
-{
-        char *b, *e;
-
-        for (b = *line; *b && is_lws(*b); ++b)
-                /* nothing */ ;
-        if (!*b) {
-                *line = b;
-                return (0);
-        }
-        for (e = b; *e && !is_lws(*e); ++e)
-                if (!is_pfcs(*e) && *e != '/')
-                        return (0);
-        if (e == b)
-                return (0);
-        *line = e;
-        *filename = b;
-        return (e - b);
-}
-
-/*
- * Parse an option.
- *
- * Returns a dynamically allocated string containing the next module
- * option, or NULL if the end of the string was reached or a disallowed
- * non-whitespace character was encountered.
- *
- * If parse_option() is successful, it updates *line to point one
- * character past the end of the option.  If it reaches the end of the
- * string, it updates *line to point to the terminating NUL character.  In
- * all other cases, it leaves *line unmodified.
- *
- * If parse_option() fails to allocate memory, it will return NULL and set
- * errno to a non-zero value.
- *
- * Allowed characters for option names are all characters in the POSIX
- * portable filename character set.  Allowed characters for option values
- * are any printable non-whitespace characters.  The option value may be
- * quoted in either single or double quotes, in which case space
- * characters and whichever quote character was not used are allowed.
- * Note that the entire value must be quoted, not just part of it.
- */
-static char *
-parse_option(char **line)
-{
-        char *nb, *ne, *vb, *ve;
-        unsigned char q = 0;
-        char *option;
-        size_t size;
-
-        errno = 0;
-        for (nb = *line; *nb && is_lws(*nb); ++nb)
-                /* nothing */ ;
-        if (!*nb) {
-                *line = nb;
-                return (NULL);
-        }
-        for (ne = nb; *ne && !is_lws(*ne) && *ne != '='; ++ne)
-                if (!is_pfcs(*ne))
-                        return (NULL);
-        if (ne == nb)
-                return (NULL);
-        if (*ne == '=') {
-                vb = ne + 1;
-                if (*vb == '"' || *vb == '\'')
-                        q = *vb++;
-                for (ve = vb;
-                     *ve && *ve != q && (is_p(*ve) || (q && is_lws(*ve)));
-                     ++ve)
-                        /* nothing */ ;
-                if (q && *ve != q)
-                        /* non-printable character or missing endquote */
-                        return (NULL);
-                if (q && *(ve + 1) && !is_lws(*(ve + 1)))
-                        /* garbage after value */
-                        return (NULL);
-        } else {
-                vb = ve = ne;
-        }
-        size = (ne - nb) + 1;
-        if (ve > vb)
-                size += (ve - vb) + 1;
-        if ((option = malloc(size)) == NULL)
-                return (NULL);
-        strncpy(option, nb, ne - nb);
-        if (ve > vb) {
-                option[ne - nb] = '=';
-                strncpy(option + (ne - nb) + 1, vb, ve - vb);
-        }
-        option[size - 1] = '\0';
-        *line = q ? ve + 1 : ve;
-        return (option);
-}
-
-/*
- * Consume trailing whitespace.
- *
- * If there are no non-whitespace characters left on the line, parse_eol()
- * updates *line to point at the terminating NUL character and returns 0.
- * Otherwise, it leaves *line unmodified and returns a non-zero value.
- */
-static int
-parse_eol(char **line)
-{
-        char *p;
-
-        for (p = *line; *p && is_lws(*p); ++p)
-                /* nothing */ ;
-        if (*p)
-                return ((unsigned char)*p);
-        *line = p;
-        return (0);
 }
 
@@ -368 +146 @@
         pam_facility_t fclt;
         pam_control_t ctlf;
-        char *line, *str, *name;
-        char *option, **optv;
-        int count, len, lineno, ret, serrno;
+        char *name, *servicename, *modulename;
+        int count, lineno, ret, serrno;
+        char **wordv, *word;
+        int i, wordc;
 
         count = 0;
@@ -376 +155 @@
         name = NULL;
         lineno = 0;
-        while ((line = openpam_readline(f, &lineno, NULL)) != NULL) {
-                /* get service name if necessary */
-                if (style == pam_conf_style) {
-                        if ((len = parse_service_name(&line, &str)) == 0) {
-                                openpam_log(PAM_LOG_NOTICE,
-                                    "%s(%d): invalid service name (ignored)",
-                                    filename, lineno);
-                                FREE(line);
-                                continue;
-                        }
-                        if (strlcmp(service, str, len) != 0) {
-                                FREE(line);
-                                continue;
-                        }
-                }
-
-                /* get facility name */
-                if ((fclt = parse_facility_name(&line)) == (pam_facility_t)-1) {
+        wordc = 0;
+        wordv = NULL;
+        while ((wordv = openpam_readlinev(f, &lineno, &wordc)) != NULL) {
+                /* blank line? */
+                if (wordc == 0) {
+                        FREEV(wordc, wordv);
+                        continue;
+                }
+                i = 0;
+
+                /* check service name if necessary */
+                if (style == pam_conf_style &&
+                    strcmp(wordv[i++], service) != 0) {
+                        FREEV(wordc, wordv);
+                        continue;
+                }
+
+                /* check facility name */
+                if ((word = wordv[i++]) == NULL ||
+                    (fclt = parse_facility_name(word)) == (pam_facility_t)-1) {
                         openpam_log(PAM_LOG_ERROR,
                             "%s(%d): missing or invalid facility",
@@ -400 +181 @@
                 }
                 if (facility != fclt && facility != PAM_FACILITY_ANY) {
-                        FREE(line);
+                        FREEV(wordc, wordv);
                         continue;
                 }
 
                 /* check for "include" */
-                if (parse_include(&line)) {
-                        if ((len = parse_service_name(&line, &str)) == 0) {
+                if ((word = wordv[i++]) != NULL &&
+                    strcmp(word, "include") == 0) {
+                        if ((servicename = wordv[i++]) == NULL ||
+                            !valid_service_name(servicename)) {
                                 openpam_log(PAM_LOG_ERROR,
-                                    "%s(%d): missing or invalid filename",
+                                    "%s(%d): missing or invalid service name",
                                     filename, lineno);
                                 goto fail;
                         }
-                        if ((name = strndup(str, len)) == NULL)
-                                goto syserr;
-                        if (parse_eol(&line) != 0) {
+                        if (wordv[i] != NULL) {
                                 openpam_log(PAM_LOG_ERROR,
                                     "%s(%d): garbage at end of line",
@@ -420 +201 @@
                                 goto fail;
                         }
-                        ret = openpam_load_chain(pamh, name, fclt);
-                        FREE(name);
+                        ret = openpam_load_chain(pamh, servicename, fclt);
+                        FREEV(wordc, wordv);
                         if (ret < 0)
                                 goto fail;
-                        FREE(line);
                         continue;
                 }
 
                 /* get control flag */
-                if ((ctlf = parse_control_flag(&line)) == (pam_control_t)-1) {
+                if (word == NULL || /* same word we compared to "include" */
+                    (ctlf = parse_control_flag(word)) == (pam_control_t)-1) {
                         openpam_log(PAM_LOG_ERROR,
                             "%s(%d): missing or invalid control flag",
@@ -437 +218 @@
 
                 /* get module name */
-                if ((len = parse_filename(&line, &str)) == 0) {
+                if ((modulename = wordv[i++]) == NULL ||
+                    !valid_filename(modulename)) {
                         openpam_log(PAM_LOG_ERROR,
                             "%s(%d): missing or invalid module name",
@@ -443 +225 @@
                         goto fail;
                 }
-                if ((name = strndup(str, len)) == NULL)
-                        goto syserr;
 
                 /* allocate new entry */
@@ -451 +231 @@
                 this->flag = ctlf;
 
-                /* get module options */
-                if ((this->optv = malloc(sizeof *optv)) == NULL)
-                        goto syserr;
-                this->optc = 0;
-                while ((option = parse_option(&line)) != NULL) {
-                        optv = realloc(this->optv,
-                            (this->optc + 2) * sizeof *optv);
-                        if (optv == NULL)
-                                goto syserr;
-                        this->optv = optv;
-                        this->optv[this->optc++] = option;
-                }
-                this->optv[this->optc] = NULL;
-                if (*line != '\0') {
-                        openpam_log(PAM_LOG_ERROR,
-                            "%s(%d): syntax error in module options",
-                            filename, lineno);
+                /* load module */
+                if ((this->module = openpam_load_module(modulename)) == NULL)
                         goto fail;
-                }
-
-                /* load module */
-                this->module = openpam_load_module(name);
-                FREE(name);
-                if (this->module == NULL)
-                        goto fail;
+
+                /*
+                 * The remaining items in wordv are the module's
+                 * arguments.  We could set this->optv = wordv + i, but
+                 * then free(this->optv) wouldn't work.  Instead, we free
+                 * the words we've already consumed, shift the rest up,
+                 * and clear the tail end of the array.
+                 */
+                this->optc = wordc - i;
+                for (i = 0; i < wordc - this->optc; ++i) {
+                        FREE(wordv[i]);
+                        wordv[i] = wordv[wordc - this->optc + i];
+                        wordv[wordc - this->optc + i] = NULL;
+                }
+                this->optv = wordv;
+                wordv = NULL;
+                wordc = 0;
 
                 /* hook it up */
@@ -484 +259 @@
                 this = NULL;
                 ++count;
-
-                /* next please... */
-                FREE(line);
         }
+        /*
+         * The loop ended because openpam_readword() returned NULL, which
+         * can happen for four different reasons: an I/O error (ferror(f)
+         * is true), a memory allocation failure (ferror(f) is false,
+         * errno is non-zero)
+         */
+        if (ferror(f) || errno != 0)
+                goto syserr;
         if (!feof(f))
-                goto syserr;
+                goto fail;
         fclose(f);
         return (count);
@@ -499 +279 @@
 fail:
         serrno = errno;
-        if (this && this->optc) {
-                while (this->optc--)
-                        FREE(this->optv[this->optc]);
-                FREE(this->optv);
-        }
+        if (this && this->optc && this->optv)
+                FREEV(this->optc, this->optv);
         FREE(this);
-        FREE(line);
+        FREEV(wordc, wordv);
+        FREE(wordv);
         FREE(name);
+        fclose(f);
         errno = serrno;
         return (-1);
@@ -539 +318 @@
         int ret, serrno;
 
+        if (!valid_service_name(service)) {
+                openpam_log(PAM_LOG_ERROR, "invalid service name");
+                errno = EINVAL;
+                RETURNN(-1);
+        }
         ENTERS(facility < 0 ? "any" : pam_facility_name[facility]);
         for (path = openpam_policy_path; *path != NULL; ++path) {

trunk/lib/openpam_impl.h

@@ -158 +158 @@
 pam_module_t    *openpam_dynamic(const char *);
 
-#define FREE(p) do { free((p)); (p) = NULL; } while (0)
+#define FREE(p)                                 \
+        do {                                    \
+                free(p);                        \
+                (p) = NULL;                     \
+        } while (0)
+
+#define FREEV(c, v)                             \
+        do {                                    \
+                while (c) {                     \
+                        --(c);                  \
+                        FREE((v)[(c)]);         \
+                }                               \
+                FREE(v);                        \
+        } while (0)
 
 #include "openpam_constants.h"

trunk/lib/openpam_load.c

@@ -109 +109 @@
         openpam_destroy_chain(chain->next);
         chain->next = NULL;
-        while (chain->optc--)
-                FREE(chain->optv[chain->optc]);
-        FREE(chain->optv);
+        FREEV(chain->optc, chain->optv);
         openpam_release_module(chain->module);
         chain->module = NULL;

trunk/lib/openpam_readline.c

@@ -45 +45 @@
 
 #include <security/pam_appl.h>
+
 #include "openpam_impl.h"
 
@@ -62 +63 @@
         int ch;
 
-        if ((line = malloc(MIN_LINE_LENGTH)) == NULL)
+        if ((line = malloc(size = MIN_LINE_LENGTH)) == NULL) {
+                openpam_log(PAM_LOG_ERROR, "malloc(): %m");
                 return (NULL);
-        size = MIN_LINE_LENGTH;
+        }
         len = 0;
-
-#define line_putch(ch) do { \
-        if (len >= size - 1) { \
-                char *tmp = realloc(line, size *= 2); \
-                if (tmp == NULL) \
-                        goto fail; \
-                line = tmp; \
-        } \
-        line[len++] = ch; \
-        line[len] = '\0'; \
-} while (0)
-
         for (;;) {
                 ch = fgetc(f);
@@ -106 +96 @@
                         break;
                 }
-                /* whitespace */
-                if (isspace(ch)) {
-                        /* ignore leading whitespace */
-                        /* collapse linear whitespace */
-                        if (len > 0 && line[len - 1] != ' ')
-                                line_putch(' ');
-                        continue;
-                }
                 /* anything else */
-                line_putch(ch);
+                if (openpam_straddch(&line, &size, &len, ch) != 0)
+                        goto fail;
         }
-
-        /* remove trailing whitespace */
-        while (len > 0 && isspace((unsigned char)line[len - 1]))
-                --len;
-        line[len] = '\0';
         if (len == 0)
                 goto fail;
         if (lenp != NULL)
                 *lenp = len;
+        openpam_log(PAM_LOG_LIBDEBUG, "returning '%s'", line);
         return (line);
 fail:
@@ -134 +113 @@
 /**
  * The =openpam_readline function reads a line from a file, and returns it
- * in a NUL-terminated buffer allocated with =malloc.
+ * in a NUL-terminated buffer allocated with =!malloc.
  *
  * The =openpam_readline function performs a certain amount of processing
  * on the data it reads:
  *
- *  - Comments (introduced by a hash sign) are stripped, as is leading and
- *    trailing whitespace.
- *  - Any amount of linear whitespace is collapsed to a single space.
+ *  - Comments (introduced by a hash sign) are stripped.
+ *
  *  - Blank lines are ignored.
+ *
  *  - If a line ends in a backslash, the backslash is stripped and the
  *    next line is appended.
@@ -153 +132 @@
  *
  * The caller is responsible for releasing the returned buffer by passing
- * it to =free.
+ * it to =!free.
+ *
+ *>openpam_readlinev
+ *>openpam_readword
  */

trunk/lib/openpam_straddch.c

@@ -12 +12 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -32 +35 @@
 #endif
 
+#include <errno.h>
 #include <stdlib.h>
 
@@ -57 +61 @@
                 if ((tmpstr = malloc(tmpsize)) == NULL) {
                         openpam_log(PAM_LOG_ERROR, "malloc(): %m");
+                        errno = ENOMEM;
                         return (-1);
                 }
@@ -67 +72 @@
                 if ((tmpstr = realloc(*str, tmpsize)) == NULL) {
                         openpam_log(PAM_LOG_ERROR, "realloc(): %m");
+                        errno = ENOMEM;
                         return (-1);
                 }
@@ -100 +106 @@
  * integer variable pointed to by =len and returns 0.
  * Otherwise, it leaves the variables pointed to by =str, =size and =len
- * unmodified and returns -1.
+ * unmodified, sets :errno to =ENOMEM and returns -1.
  */

@@ -9 +9 @@
 openpam_nullconv.3
 openpam_readline.3
+openpam_readlinev.3
+openpam_readword.3
 openpam_restore_cred.3
 openpam_set_option.3
+openpam_straddch.3
 openpam_subst.3
 openpam_ttyconv.3