Index: stable/9/contrib/openpam/doc/man/openpam_straddch.3 =================================================================== --- stable/9/contrib/openpam/doc/man/openpam_straddch.3 (revision 249049) +++ stable/9/contrib/openpam/doc/man/openpam_straddch.3 (revision 249050) @@ -1,122 +1,139 @@ .\"- .\" Copyright (c) 2001-2003 Networks Associates Technology, Inc. .\" Copyright (c) 2004-2011 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and .\" Network Associates Laboratories, the Security Research Division of .\" Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 .\" ("CBOSS"), as part of the DARPA CHATS research program. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" 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 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" $Id$ .\" -.Dd May 26, 2012 +.Dd March 3, 2013 .Dt OPENPAM_STRADDCH 3 .Os .Sh NAME .Nm openpam_straddch .Nd add a character to a string, expanding the buffer if needed .Sh LIBRARY .Lb libpam .Sh SYNOPSIS .In sys/types.h .In security/pam_appl.h .In security/openpam.h .Ft "int" .Fn openpam_straddch "char **str" "size_t *size" "size_t *len" "int ch" .Sh DESCRIPTION The .Fn openpam_straddch function appends a character to a dynamically allocated NUL-terminated buffer, reallocating the buffer as needed. .Pp The .Fa str argument points to a variable containing either a pointer to an existing buffer or .Dv NULL . If the value of the variable pointed to by .Fa str is .Dv NULL , a new buffer is allocated. .Pp The .Fa size and .Fa len argument point to variables used to hold the size of the buffer and the length of the string it contains, respectively. .Pp +The final argument, +.Fa ch , +is the character that should be appended to +the string. If +.Fa ch +is 0, nothing is appended, but a new buffer is +still allocated if +.Fa str +is NULL. This can be used to +.Do +bootstrap +.Dc +the +string. +.Pp If a new buffer is allocated or an existing buffer is reallocated to make room for the additional character, .Fa str and .Fa size are updated accordingly. .Pp The .Fn openpam_straddch function ensures that the buffer is always NUL-terminated. .Pp If the .Fn openpam_straddch function is successful, it increments the integer variable pointed to by .Fa len -and returns 0. +(unless +.Fa ch +was 0) and returns 0. Otherwise, it leaves the variables pointed to by .Fa str , .Fa size and .Fa len unmodified, sets .Va errno to .Dv ENOMEM and returns -1. .Pp .Sh RETURN VALUES The .Fn openpam_straddch function returns 0 on success and -1 on failure. .Sh SEE ALSO .Xr pam 3 , .Xr pam_strerror 3 .Sh STANDARDS The .Fn openpam_straddch function is an OpenPAM extension. .Sh AUTHORS The .Fn openpam_straddch function and this manual page were developed by .An Dag-Erling Sm\(/orgrav Aq des@des.no . Index: stable/9/contrib/openpam/lib/openpam_readline.c =================================================================== --- stable/9/contrib/openpam/lib/openpam_readline.c (revision 249049) +++ stable/9/contrib/openpam/lib/openpam_readline.c (revision 249050) @@ -1,140 +1,138 @@ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. * Copyright (c) 2004-2011 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and * Network Associates Laboratories, the Security Research Division of * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * 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 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $Id: openpam_readline.c 596 2012-04-14 14:52:40Z des $ */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include #include #include #include "openpam_impl.h" #define MIN_LINE_LENGTH 128 /* * OpenPAM extension * * Read a line from a file. */ char * openpam_readline(FILE *f, int *lineno, size_t *lenp) { char *line; size_t len, size; int ch; - if ((line = malloc(size = MIN_LINE_LENGTH)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); + line = NULL; + if (openpam_straddch(&line, &size, &len, 0) != 0) return (NULL); - } - len = 0; for (;;) { ch = fgetc(f); /* strip comment */ if (ch == '#') { do { ch = fgetc(f); } while (ch != EOF && ch != '\n'); } /* eof */ if (ch == EOF) { /* done */ break; } /* eol */ if (ch == '\n') { if (lineno != NULL) ++*lineno; /* skip blank lines */ if (len == 0) continue; /* continuation */ if (line[len - 1] == '\\') { line[--len] = '\0'; continue; } /* done */ break; } /* anything else */ if (openpam_straddch(&line, &size, &len, ch) != 0) goto fail; } if (len == 0) goto fail; if (lenp != NULL) *lenp = len; openpam_log(PAM_LOG_LIBDEBUG, "returning '%s'", line); return (line); fail: FREE(line); return (NULL); } /** * DEPRECATED openpam_readlinev * * The =openpam_readline function reads a line from a file, and returns it * 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. * * - Blank lines are ignored. * * - If a line ends in a backslash, the backslash is stripped and the * next line is appended. * * If =lineno is not =NULL, the integer variable it points to is * incremented every time a newline character is read. * * If =lenp is not =NULL, the length of the line (not including the * terminating NUL character) is stored in the variable it points to. * * The caller is responsible for releasing the returned buffer by passing * it to =!free. * * >openpam_readlinev * >openpam_readword */ Index: stable/9/contrib/openpam/lib/openpam_readword.c =================================================================== --- stable/9/contrib/openpam/lib/openpam_readword.c (revision 249049) +++ stable/9/contrib/openpam/lib/openpam_readword.c (revision 249050) @@ -1,207 +1,202 @@ /*- * Copyright (c) 2012 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * 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 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $Id: openpam_readword.c 588 2012-04-08 11:52:25Z des $ */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include #include #include #include "openpam_impl.h" #include "openpam_ctype.h" #define MIN_WORD_SIZE 32 /* * OpenPAM extension * * Read a word from a file, respecting shell quoting rules. */ char * openpam_readword(FILE *f, int *lineno, size_t *lenp) { char *word; size_t size, len; int ch, comment, escape, quote; int serrno; errno = 0; /* skip initial whitespace */ comment = 0; while ((ch = getc(f)) != EOF && ch != '\n') { if (ch == '#') comment = 1; if (!is_lws(ch) && !comment) break; } if (ch == EOF) return (NULL); ungetc(ch, f); if (ch == '\n') return (NULL); word = NULL; size = len = 0; escape = quote = 0; while ((ch = fgetc(f)) != EOF && (!is_ws(ch) || quote || escape)) { if (ch == '\\' && !escape && quote != '\'') { /* escape next character */ escape = ch; } else if ((ch == '\'' || ch == '"') && !quote && !escape) { /* begin quote */ quote = ch; /* edge case: empty quoted string */ - if (word == NULL && (word = malloc(1)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); - errno = ENOMEM; + if (openpam_straddch(&word, &size, &len, 0) != 0) return (NULL); - } - *word = '\0'; - size = 1; } else if (ch == quote && !escape) { /* end quote */ quote = 0; } else if (ch == '\n' && escape && quote != '\'') { /* line continuation */ escape = 0; } else { if (escape && quote && ch != '\\' && ch != quote && openpam_straddch(&word, &size, &len, '\\') != 0) { free(word); errno = ENOMEM; return (NULL); } if (openpam_straddch(&word, &size, &len, ch) != 0) { free(word); errno = ENOMEM; return (NULL); } escape = 0; } if (lineno != NULL && ch == '\n') ++*lineno; } if (ch == EOF && ferror(f)) { serrno = errno; free(word); errno = serrno; return (NULL); } if (ch == EOF && (escape || quote)) { /* Missing escaped character or closing quote. */ openpam_log(PAM_LOG_ERROR, "unexpected end of file"); free(word); errno = EINVAL; return (NULL); } ungetc(ch, f); if (lenp != NULL) *lenp = len; return (word); } /** * The =openpam_readword function reads the next word from a file, and * returns it in a NUL-terminated buffer allocated with =!malloc. * * A word is a sequence of non-whitespace characters. * However, whitespace characters can be included in a word if quoted or * escaped according to the following rules: * * - An unescaped single or double quote introduces a quoted string, * which ends when the same quote character is encountered a second * time. * The quotes themselves are stripped. * * - Within a single- or double-quoted string, all whitespace characters, * including the newline character, are preserved as-is. * * - Outside a quoted string, a backslash escapes the next character, * which is preserved as-is, unless that character is a newline, in * which case it is discarded and reading continues at the beginning of * the next line as if the backslash and newline had not been there. * In all cases, the backslash itself is discarded. * * - Within a single-quoted string, double quotes and backslashes are * preserved as-is. * * - Within a double-quoted string, a single quote is preserved as-is, * and a backslash is preserved as-is unless used to escape a double * quote. * * In addition, if the first non-whitespace character on the line is a * hash character (#), the rest of the line is discarded. * If a hash character occurs within a word, however, it is preserved * as-is. * A backslash at the end of a comment does cause line continuation. * * If =lineno is not =NULL, the integer variable it points to is * incremented every time a quoted or escaped newline character is read. * * If =lenp is not =NULL, the length of the word (after quotes and * backslashes have been removed) is stored in the variable it points to. * * RETURN VALUES * * If successful, the =openpam_readword function returns a pointer to a * dynamically allocated NUL-terminated string containing the first word * encountered on the line. * * The caller is responsible for releasing the returned buffer by passing * it to =!free. * * If =openpam_readword reaches the end of the line or file before any * characters are copied to the word, it returns =NULL. In the former * case, the newline is pushed back to the file. * * If =openpam_readword reaches the end of the file while a quote or * backslash escape is in effect, it sets :errno to =EINVAL and returns * =NULL. * * IMPLEMENTATION NOTES * * The parsing rules are intended to be equivalent to the normal POSIX * shell quoting rules. * Any discrepancy is a bug and should be reported to the author along * with sample input that can be used to reproduce the error. * * >openpam_readline * >openpam_readlinev * * AUTHOR DES */ Index: stable/9/contrib/openpam =================================================================== --- stable/9/contrib/openpam (revision 249049) +++ stable/9/contrib/openpam (revision 249050) Property changes on: stable/9/contrib/openpam ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,2 ## Merged /head/contrib/openpam:r247810 Merged /vendor/openpam/dist:r247809