diff options
author | des <des@FreeBSD.org> | 2002-12-16 15:28:05 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-12-16 15:28:05 +0000 |
commit | 9c13a1ee5f744e6c21ae65cb3ed17e00d241a72f (patch) | |
tree | ecbdd15371b5e36058a6a262d89a55baf407a91c /contrib/openpam/lib/pam_putenv.c | |
parent | 7966ff24b5238d36ecd0fce943ba5db101374b4e (diff) | |
parent | 18c136aadd659f7b141653f3f614063e70bc59eb (diff) | |
download | FreeBSD-src-9c13a1ee5f744e6c21ae65cb3ed17e00d241a72f.zip FreeBSD-src-9c13a1ee5f744e6c21ae65cb3ed17e00d241a72f.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r107937,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/openpam/lib/pam_putenv.c')
-rw-r--r-- | contrib/openpam/lib/pam_putenv.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/contrib/openpam/lib/pam_putenv.c b/contrib/openpam/lib/pam_putenv.c index 9c7df0e..d3c220f 100644 --- a/contrib/openpam/lib/pam_putenv.c +++ b/contrib/openpam/lib/pam_putenv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_putenv.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_putenv.c#9 $ */ #include <stdlib.h> @@ -55,20 +55,21 @@ pam_putenv(pam_handle_t *pamh, char **env, *p; int i; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* sanity checks */ if (namevalue == NULL || (p = strchr(namevalue, '=')) == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* see if the variable is already in the environment */ if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) != -1) { if ((p = strdup(namevalue)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); free(pamh->env[i]); pamh->env[i] = p; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* grow the environment list if necessary */ @@ -76,16 +77,16 @@ pam_putenv(pam_handle_t *pamh, env = realloc(pamh->env, sizeof(char *) * (pamh->env_size * 2 + 1)); if (env == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); pamh->env = env; pamh->env_size = pamh->env_size * 2 + 1; } /* add the variable at the end */ if ((pamh->env[pamh->env_count] = strdup(namevalue)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); ++pamh->env_count; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* |