diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:06:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:06:50 +0100 |
| commit | efe4eb109ff92bad1a88a9cc7485b67710b96b15 (patch) | |
| tree | bc4d565d468ba67ada50f7b9f8ee7445d331532f | |
| parent | ba9f5c79c77806c199d2bd839c0c19e9da3cdeec (diff) | |
| parent | b54621a3ab17b0e2f6375b09c5854fc89c5cf412 (diff) | |
| download | otp-efe4eb109ff92bad1a88a9cc7485b67710b96b15.tar.gz otp-efe4eb109ff92bad1a88a9cc7485b67710b96b15.tar.bz2 otp-efe4eb109ff92bad1a88a9cc7485b67710b96b15.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/inets/src/http_server/mod_auth_server.erl | 2 | ||||
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 7 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/mod_auth_server.erl b/lib/inets/src/http_server/mod_auth_server.erl index 93d8145821..90d9ee34b1 100644 --- a/lib/inets/src/http_server/mod_auth_server.erl +++ b/lib/inets/src/http_server/mod_auth_server.erl @@ -128,7 +128,7 @@ list_group_members(Addr, Port, Dir, Group, Password) -> list_group_members(Addr, Port, ?DEFAULT_PROFILE, Dir, Group, Password). list_group_members(Addr, Port, Profile, Dir, Group, Password) -> Name = make_name(Addr, Port, Profile), - Req = {list_group_members, Addr, Port, Dir, Group, Password}, + Req = {list_group_members, Addr, Port, Profile, Dir, Group, Password}, call(Name, Req). delete_group(Addr, Port, Dir, GroupName, Password) -> diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 28e77151f2..aae4ce5256 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -521,6 +521,9 @@ do_auth_api(AuthPrefix, Config) -> "two", "group1"), add_group_member(Node, ServerRoot, Port, AuthPrefix, "secret", "Aladdin", "group2"), + {ok, Members} = list_group_members(Node, ServerRoot, Port, AuthPrefix, "secret", "group1"), + true = lists:member("one", Members), + true = lists:member("two", Members), ok = auth_status(auth_request("/" ++ AuthPrefix ++ "secret/", "one", "onePassword", Version, Host), Config, [{statuscode, 200}]), @@ -2155,6 +2158,10 @@ add_group_member(Node, Root, Port, AuthPrefix, Dir, User, Group) -> Directory = filename:join([Root, "htdocs", AuthPrefix ++ Dir]), rpc:call(Node, mod_auth, add_group_member, [Group, User, Addr, Port, Directory]). +list_group_members(Node, Root, Port, AuthPrefix, Dir, Group) -> + Directory = filename:join([Root, "htdocs", AuthPrefix ++ Dir]), + rpc:call(Node, mod_auth, list_group_members, [Group, [{port, Port}, {dir, Directory}]]). + getaddr() -> {ok,HostName} = inet:gethostname(), {ok,{A1,A2,A3,A4}} = inet:getaddr(HostName,inet), diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 59732c7926..2cdb825d75 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1 +1 @@ -SSL_VSN = 8.0.3 +SSL_VSN = 8.1 |