aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-12-29 10:13:57 +0100
committerMarcus Arendt <[email protected]>2014-12-29 10:13:57 +0100
commit4f7edc376ee61238699f68c8721ab23ee56eafee (patch)
tree1f403607afa54044cd2a64c6e545ee564e765b8c /lib/inets/test
parentbbf2555c6b8112407674c766f7884940669cf069 (diff)
parentf445c0008c389ff06741e5d5a18d6c75861598cf (diff)
downloadotp-4f7edc376ee61238699f68c8721ab23ee56eafee.tar.gz
otp-4f7edc376ee61238699f68c8721ab23ee56eafee.tar.bz2
otp-4f7edc376ee61238699f68c8721ab23ee56eafee.zip
Merge branch 'lemenkov/use_os_getenv_2'
* lemenkov/use_os_getenv_2: fix missing include Start using os:getenv/2 fun Introduce os:getenv/2
Diffstat (limited to 'lib/inets/test')
-rw-r--r--lib/inets/test/erl_make_certs.erl10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/inets/test/erl_make_certs.erl b/lib/inets/test/erl_make_certs.erl
index 22dc951ac1..6c168a5704 100644
--- a/lib/inets/test/erl_make_certs.erl
+++ b/lib/inets/test/erl_make_certs.erl
@@ -204,7 +204,7 @@ issuer_der(Issuer) ->
Subject.
subject(undefined, IsRootCA) ->
- User = if IsRootCA -> "RootCA"; true -> user() end,
+ User = if IsRootCA -> "RootCA"; true -> os:getenv("USER", "test_user") end,
Opts = [{email, User ++ "@erlang.org"},
{name, User},
{city, "Stockholm"},
@@ -215,14 +215,6 @@ subject(undefined, IsRootCA) ->
subject(Opts, _) ->
subject(Opts).
-user() ->
- case os:getenv("USER") of
- false ->
- "test_user";
- User ->
- User
- end.
-
subject(SubjectOpts) when is_list(SubjectOpts) ->
Encode = fun(Opt) ->
{Type,Value} = subject_enc(Opt),