diff options
| author | scf <scf@FreeBSD.org> | 2008-08-02 02:34:35 +0000 |
|---|---|---|
| committer | scf <scf@FreeBSD.org> | 2008-08-02 02:34:35 +0000 |
| commit | e0b5c971c2aa4250126a8dab9c31bf0c6495e746 (patch) | |
| tree | 56a644b40c074e9be4e1f55022d96abde55efb77 /tools/regression/environ/envtest.t | |
| parent | 8b381816e429dcf85d6f0731aa32111576ac8cc7 (diff) | |
| download | FreeBSD-src-e0b5c971c2aa4250126a8dab9c31bf0c6495e746.zip FreeBSD-src-e0b5c971c2aa4250126a8dab9c31bf0c6495e746.tar.gz | |
Detect if the application has cleared the environ variable by setting
the first value (environ[0]) to NULL. This is in addition to the
current detection of environ being replaced, which includes being set to
NULL. Without this fix, the environment is not truly wiped, but appears
to be by getenv() until an *env() call is made to alter the enviroment.
This change is necessary to support those applications that use this
method for clearing environ such as Dovecot and Postfix. Applications
such as Sendmail and the base system's env replace environ (already
detected). While neither of these methods are defined by SUSv3, it is
best to support them due to historic reasons and in lieu of a clean,
defined method.
Add extra units tests for clearing environ using four different methods:
1. Set environ to NULL pointer.
2. Set environ[0] to NULL pointer.
3. Set environ to calloc()'d NULL-terminated array.
4. Set environ to static NULL-terminated array.
Noticed by: Timo Sirainen
MFC after: 3 days
Diffstat (limited to 'tools/regression/environ/envtest.t')
| -rw-r--r-- | tools/regression/environ/envtest.t | 54 |
1 files changed, 41 insertions, 13 deletions
diff --git a/tools/regression/environ/envtest.t b/tools/regression/environ/envtest.t index d3243d3..6b5485a 100644 --- a/tools/regression/environ/envtest.t +++ b/tools/regression/environ/envtest.t @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2007 Sean C. Farley <scf@FreeBSD.org> +# Copyright (c) 2007-2008 Sean C. Farley <scf@FreeBSD.org> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -81,19 +81,47 @@ export FOO=${BAR} run_test -g FOO check_result "${FOO}" -run_test -c -g FOO +run_test -c 3 -g FOO check_result "${NULL}" run_test -g FOOBAR check_result "${NULL}" -run_test -c -g FOOBAR +run_test -c 3 -g FOOBAR check_result "${NULL}" run_test -G check_result "${NULL}" +# Clear environ. +run_test -c 1 -g FOO +check_result "${NULL}" + +run_test -c 2 -g FOO +check_result "${NULL}" + +run_test -c 3 -g FOO +check_result "${NULL}" + +run_test -c 4 -g FOO +check_result "${NULL}" + + +# Clear environ and verify values do not return after a set. +run_test -c 1 -g FOO -s FOO2 ${NEWBAR} 1 -g FOO -g FOO2 +check_result "${NULL} 0 0 ${NULL} ${NEWBAR}" + +run_test -c 2 -g FOO -s FOO2 ${NEWBAR} 1 -g FOO -g FOO2 +check_result "${NULL} 0 0 ${NULL} ${NEWBAR}" + +run_test -c 3 -g FOO -s FOO2 ${NEWBAR} 1 -g FOO -g FOO2 +check_result "${NULL} 0 0 ${NULL} ${NEWBAR}" + +run_test -c 4 -g FOO -s FOO2 ${NEWBAR} 1 -g FOO -g FOO2 +check_result "${NULL} 0 0 ${NULL} ${NEWBAR}" + + # Sets. run_test -s FOO ${NEWBAR} 0 -g FOO check_result "0 0 ${BAR}" @@ -101,10 +129,10 @@ check_result "0 0 ${BAR}" run_test -s FOO ${NEWBAR} 1 -g FOO check_result "0 0 ${NEWBAR}" -run_test -c -s FOO ${NEWBAR} 0 -g FOO +run_test -c 3 -s FOO ${NEWBAR} 0 -g FOO check_result "0 0 ${NEWBAR}" -run_test -c -s FOO ${NEWBAR} 1 -g FOO +run_test -c 3 -s FOO ${NEWBAR} 1 -g FOO check_result "0 0 ${NEWBAR}" run_test -s "FOO=" ${NEWBAR} 1 -g FOO @@ -125,7 +153,7 @@ check_result "-1 22" run_test -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -g FOO check_result "0 0 0 0 ${BAR}" -run_test -c -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -g FOO +run_test -c 3 -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -g FOO check_result "0 0 0 0 ${BAR}" run_test -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -s FOO ${NEWBAR} 1 -g FOO @@ -135,7 +163,7 @@ run_test -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1\ -g FOO check_result "0 0 0 0 0 0 0 0 ${BAR}" -run_test -c -s FOO ${BAR} 1 -g FOO -c -s FOO ${NEWBAR} 1 -g FOO +run_test -c 3 -s FOO ${BAR} 1 -g FOO -c 3 -s FOO ${NEWBAR} 1 -g FOO check_result "0 0 ${BAR} 0 0 ${NEWBAR}" @@ -143,7 +171,7 @@ check_result "0 0 ${BAR} 0 0 ${NEWBAR}" run_test -u FOO -g FOO check_result "0 0 ${NULL}" -run_test -c -u FOO -g FOO +run_test -c 3 -u FOO -g FOO check_result "0 0 ${NULL}" run_test -U @@ -155,10 +183,10 @@ check_result "-1 22" run_test -u "=${BAR}" check_result "-1 22" -run_test -c -s FOO ${NEWBAR} 1 -g FOO -u FOO -g FOO +run_test -c 3 -s FOO ${NEWBAR} 1 -g FOO -u FOO -g FOO check_result "0 0 ${NEWBAR} 0 0 ${NULL}" -run_test -c -u FOO -s FOO ${BAR} 1 -g FOO -u FOO -g FOO -c -u FOO\ +run_test -c 3 -u FOO -s FOO ${BAR} 1 -g FOO -u FOO -g FOO -c 3 -u FOO\ -s FOO ${NEWBAR} 1 -g FOO check_result "0 0 0 0 ${BAR} 0 0 ${NULL} 0 0 0 0 ${NEWBAR}" @@ -167,7 +195,7 @@ check_result "0 0 0 0 ${BAR} 0 0 ${NULL} 0 0 0 0 ${NEWBAR}" run_test -p FOO=${NEWBAR} -g FOO check_result "0 0 ${NEWBAR}" -run_test -c -p FOO=${NEWBAR} -g FOO +run_test -c 3 -p FOO=${NEWBAR} -g FOO check_result "0 0 ${NEWBAR}" run_test -p FOO -g FOO @@ -191,10 +219,10 @@ check_result "0 0 0 0 0 0" run_test -s FOO ${NEWBAR} 1 -p FOO=${BAR} -u FOO check_result "0 0 0 0 0 0" -run_test -s FOO ${NEWBAR} 1 -p FOO=${BAR} -c -g FOO -p FOO=${NEWBAR} -g FOO +run_test -s FOO ${NEWBAR} 1 -p FOO=${BAR} -c 3 -g FOO -p FOO=${NEWBAR} -g FOO check_result "0 0 0 0 ${NULL} 0 0 ${NEWBAR}" -run_test -c -p FOO=${BAR} -g FOO -c -p FOO=${NEWBAR} -g FOO +run_test -c 3 -p FOO=${BAR} -g FOO -c 3 -p FOO=${NEWBAR} -g FOO check_result "0 0 ${BAR} 0 0 ${NEWBAR}" |
