Deleted Added
full compact
pam_putenv.c (302408) pam_putenv.c (91094)
1/*-
1/*-
2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
3 * Copyright (c) 2004-2011 Dag-Erling Sm��rgrav
2 * Copyright (c) 2002 Networks Associates Technologies, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by ThinkSec AS and
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by ThinkSec AS and
7 * Network Associates Laboratories, the Security Research Division of
8 * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
9 * ("CBOSS"), as part of the DARPA CHATS research program.
6 * NAI Labs, the Security Research Division of Network Associates, Inc.
7 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
8 * DARPA CHATS research program.
10 *
11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions
13 * are met:
14 * 1. Redistributions of source code must retain the above copyright
15 * notice, this list of conditions and the following disclaimer.
16 * 2. Redistributions in binary form must reproduce the above copyright
17 * notice, this list of conditions and the following disclaimer in the

--- 9 unchanged lines hidden (view full) ---

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
9 *
10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions
12 * are met:
13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the

--- 9 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
35 * $Id: pam_putenv.c 648 2013-03-05 17:54:27Z des $
34 * $Id$
36 */
37
35 */
36
38#ifdef HAVE_CONFIG_H
39# include "config.h"
40#endif
41
42#include <stdlib.h>
43#include <string.h>
44
45#include <security/pam_appl.h>
46
47#include "openpam_impl.h"
48
49/*

--- 5 unchanged lines hidden (view full) ---

55
56int
57pam_putenv(pam_handle_t *pamh,
58 const char *namevalue)
59{
60 char **env, *p;
61 int i;
62
37#include <stdlib.h>
38#include <string.h>
39
40#include <security/pam_appl.h>
41
42#include "openpam_impl.h"
43
44/*

--- 5 unchanged lines hidden (view full) ---

50
51int
52pam_putenv(pam_handle_t *pamh,
53 const char *namevalue)
54{
55 char **env, *p;
56 int i;
57
63 ENTER();
64 if (pamh == NULL)
58 if (pamh == NULL)
65 RETURNC(PAM_SYSTEM_ERR);
59 return (PAM_SYSTEM_ERR);
66
67 /* sanity checks */
68 if (namevalue == NULL || (p = strchr(namevalue, '=')) == NULL)
60
61 /* sanity checks */
62 if (namevalue == NULL || (p = strchr(namevalue, '=')) == NULL)
69 RETURNC(PAM_SYSTEM_ERR);
63 return (PAM_SYSTEM_ERR);
70
71 /* see if the variable is already in the environment */
64
65 /* see if the variable is already in the environment */
72 if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) >= 0) {
66 if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) != -1) {
73 if ((p = strdup(namevalue)) == NULL)
67 if ((p = strdup(namevalue)) == NULL)
74 RETURNC(PAM_BUF_ERR);
75 FREE(pamh->env[i]);
68 return (PAM_BUF_ERR);
69 free(pamh->env[i]);
76 pamh->env[i] = p;
70 pamh->env[i] = p;
77 RETURNC(PAM_SUCCESS);
71 return (PAM_SUCCESS);
78 }
79
80 /* grow the environment list if necessary */
81 if (pamh->env_count == pamh->env_size) {
72 }
73
74 /* grow the environment list if necessary */
75 if (pamh->env_count == pamh->env_size) {
82 env = realloc(pamh->env,
83 sizeof(char *) * (pamh->env_size * 2 + 1));
76 env = realloc(pamh->env, pamh->env_size * 2 + 1);
84 if (env == NULL)
77 if (env == NULL)
85 RETURNC(PAM_BUF_ERR);
78 return (PAM_BUF_ERR);
86 pamh->env = env;
87 pamh->env_size = pamh->env_size * 2 + 1;
88 }
89
90 /* add the variable at the end */
91 if ((pamh->env[pamh->env_count] = strdup(namevalue)) == NULL)
79 pamh->env = env;
80 pamh->env_size = pamh->env_size * 2 + 1;
81 }
82
83 /* add the variable at the end */
84 if ((pamh->env[pamh->env_count] = strdup(namevalue)) == NULL)
92 RETURNC(PAM_BUF_ERR);
85 return (PAM_BUF_ERR);
93 ++pamh->env_count;
86 ++pamh->env_count;
94 RETURNC(PAM_SUCCESS);
87 return (PAM_SUCCESS);
95}
88}
96
97/*
98 * Error codes:
99 *
100 * PAM_SYSTEM_ERR
101 * PAM_BUF_ERR
102 */
103
104/**
105 * The =pam_putenv function sets an environment variable.
106 * Its semantics are similar to those of =putenv, but it modifies the PAM
107 * context's environment list instead of the application's.
108 *
109 * >pam_getenv
110 * >pam_getenvlist
111 * >pam_setenv
112 */