Merge pull request #13916 from rabbitmq/otp28-fixes
Trigger a 4.2.x alpha release build / trigger_alpha_build (push) Waiting to run
Details
Test (make) / Build and Xref (1.17, 26) (push) Waiting to run
Details
Test (make) / Build and Xref (1.17, 27) (push) Waiting to run
Details
Test (make) / Test (1.17, 27, khepri) (push) Waiting to run
Details
Test (make) / Test (1.17, 27, mnesia) (push) Waiting to run
Details
Test (make) / Test mixed clusters (1.17, 27, khepri) (push) Waiting to run
Details
Test (make) / Test mixed clusters (1.17, 27, mnesia) (push) Waiting to run
Details
Test (make) / Type check (1.17, 27) (push) Waiting to run
Details
Test Authentication/Authorization backends via mutiple messaging protocols / selenium (chrome, 1.17.3, 27.3) (push) Has been cancelled
Details
Test Authentication/Authorization backends via mutiple messaging protocols / summary-selenium (push) Has been cancelled
Details
Trigger a 4.2.x alpha release build / trigger_alpha_build (push) Waiting to run
Details
Test (make) / Build and Xref (1.17, 26) (push) Waiting to run
Details
Test (make) / Build and Xref (1.17, 27) (push) Waiting to run
Details
Test (make) / Test (1.17, 27, khepri) (push) Waiting to run
Details
Test (make) / Test (1.17, 27, mnesia) (push) Waiting to run
Details
Test (make) / Test mixed clusters (1.17, 27, khepri) (push) Waiting to run
Details
Test (make) / Test mixed clusters (1.17, 27, mnesia) (push) Waiting to run
Details
Test (make) / Type check (1.17, 27) (push) Waiting to run
Details
Test Authentication/Authorization backends via mutiple messaging protocols / selenium (chrome, 1.17.3, 27.3) (push) Has been cancelled
Details
Test Authentication/Authorization backends via mutiple messaging protocols / summary-selenium (push) Has been cancelled
Details
OTP28: re:split change; street-address macro
This commit is contained in:
commit
4f1076d89c
|
@ -145,7 +145,7 @@ format_rdn(#'AttributeTypeAndValue'{type = T, value = V}) ->
|
|||
{?'id-at-pseudonym' , "PSEUDONYM"},
|
||||
{?'id-domainComponent' , "DC"},
|
||||
{?'id-emailAddress' , "EMAILADDRESS"},
|
||||
{?'street-address' , "STREET"},
|
||||
{17 , "STREET"}, %% macro was removed in OTP28
|
||||
{{0,9,2342,19200300,100,1,1} , "UID"}], %% Not in public_key.hrl
|
||||
case proplists:lookup(T, Fmts) of
|
||||
{_, Fmt} ->
|
||||
|
|
|
@ -8,7 +8,7 @@ export BUILD_WITHOUT_QUIC
|
|||
LOCAL_DEPS = inets public_key
|
||||
BUILD_DEPS = rabbit_common rabbitmq_cli
|
||||
DEPS = rabbit cowlib jose base64url oauth2_client
|
||||
TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_web_mqtt emqtt rabbitmq_amqp_client
|
||||
TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt rabbitmq_web_mqtt emqtt rabbitmq_amqp_client
|
||||
|
||||
PLT_APPS += rabbitmq_cli
|
||||
|
||||
|
|
|
@ -1226,7 +1226,8 @@ vhost_in_username(UserBin) ->
|
|||
%% split at the last colon, disallowing colons in username
|
||||
case re:split(UserBin, ":(?!.*?:)") of
|
||||
[_, _] -> true;
|
||||
[UserBin] -> false
|
||||
[UserBin] -> false;
|
||||
[] -> false
|
||||
end
|
||||
end.
|
||||
|
||||
|
@ -1238,7 +1239,8 @@ get_vhost_username(UserBin) ->
|
|||
%% split at the last colon, disallowing colons in username
|
||||
case re:split(UserBin, ":(?!.*?:)") of
|
||||
[Vhost, UserName] -> {Vhost, UserName};
|
||||
[UserBin] -> Default
|
||||
[UserBin] -> Default;
|
||||
[] -> Default
|
||||
end
|
||||
end.
|
||||
|
||||
|
|
Loading…
Reference in New Issue