summaryrefslogtreecommitdiffstats
path: root/contrib/openpam/lib/pam_setenv.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/openpam/lib/pam_setenv.c')
-rw-r--r--contrib/openpam/lib/pam_setenv.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/openpam/lib/pam_setenv.c b/contrib/openpam/lib/pam_setenv.c
index f516a1b..1c16039 100644
--- a/contrib/openpam/lib/pam_setenv.c
+++ b/contrib/openpam/lib/pam_setenv.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
* All rights reserved.
*
* This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -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_setenv.c#8 $
+ * $P4: //depot/projects/openpam/lib/pam_setenv.c#12 $
*/
#include <stdlib.h>
@@ -67,15 +67,14 @@ pam_setenv(pam_handle_t *pamh,
RETURNC(PAM_SYSTEM_ERR);
/* is it already there? */
- if (!overwrite && openpam_findenv(pamh, name, strlen(name)) != -1)
+ if (!overwrite && openpam_findenv(pamh, name, strlen(name)) >= 0)
RETURNC(PAM_SUCCESS);
/* set it... */
- if ((env = malloc(strlen(name) + strlen(value) + 2)) == NULL)
+ if (asprintf(&env, "%s=%s", name, value) < 0)
RETURNC(PAM_BUF_ERR);
- sprintf(env, "%s=%s", name, value);
r = pam_putenv(pamh, env);
- free(env);
+ FREE(env);
RETURNC(r);
}
OpenPOWER on IntegriCloud