diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-11-07 02:43:24 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2013-11-07 02:43:43 +1000 |
| commit | 89a17ba84aa03564381bfde0971d0f25504fdf08 (patch) | |
| tree | ad093b645ef3f8588fab9cdfddd8f375c2c291b3 /src | |
| parent | Do not use functions from crypto module wherever possible (diff) | |
Correctly convert ACLs into YAML representation
Diffstat (limited to 'src')
| -rw-r--r-- | src/acl.erl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/acl.erl b/src/acl.erl index 4c4523617..d669d2896 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -455,22 +455,22 @@ transform_options({acl, Name, Type}, Opts) -> T = case Type of all -> all; none -> none; - {user, U} -> {user, [U]}; - {user, U, S} -> {user, [[{U, S}]]}; - {shared_group, G} -> {shared_group, [G]}; - {shared_group, G, H} -> {shared_group, [[{G, H}]]}; - {user_regexp, UR} -> {user_regexp, [UR]}; - {user_regexp, UR, S} -> {user_regexp, [[{UR, S}]]}; - {node_regexp, UR, SR} -> {node_regexp, [[{UR, SR}]]}; - {user_glob, UR} -> {user_glob, [UR]}; - {user_glob, UR, S} -> {user_glob, [[{UR, S}]]}; - {node_glob, UR, SR} -> {node_glob, [[{UR, SR}]]}; - {server, S} -> {server, [S]}; - {resource, R} -> {resource, [R]}; - {server_regexp, SR} -> {server_regexp, [SR]}; - {server_glob, S} -> {server_glob, [S]}; - {ip, S} -> {ip, [S]}; - {resource_glob, R} -> {resource_glob, [R]} + {user, U} -> {user, [b(U)]}; + {user, U, S} -> {user, [[{b(U), b(S)}]]}; + {shared_group, G} -> {shared_group, [b(G)]}; + {shared_group, G, H} -> {shared_group, [[{b(G), b(H)}]]}; + {user_regexp, UR} -> {user_regexp, [b(UR)]}; + {user_regexp, UR, S} -> {user_regexp, [[{b(UR), b(S)}]]}; + {node_regexp, UR, SR} -> {node_regexp, [[{b(UR), b(SR)}]]}; + {user_glob, UR} -> {user_glob, [b(UR)]}; + {user_glob, UR, S} -> {user_glob, [[{b(UR), b(S)}]]}; + {node_glob, UR, SR} -> {node_glob, [[{b(UR), b(SR)}]]}; + {server, S} -> {server, [b(S)]}; + {resource, R} -> {resource, [b(R)]}; + {server_regexp, SR} -> {server_regexp, [b(SR)]}; + {server_glob, S} -> {server_glob, [b(S)]}; + {ip, S} -> {ip, [b(S)]}; + {resource_glob, R} -> {resource_glob, [b(R)]} end, [{acl, [{Name, [T]}]}|Opts]; transform_options({access, Name, Rules}, Opts) -> |