@@ -378,14 +378,8 @@ search_groups(LDAP, Desc, GroupsBase, Scope, DN) ->
378
378
[];
379
379
{ok , {referral , Referrals }} ->
380
380
{error , {referrals_not_supported , Referrals }};
381
- % % support #eldap_search_result before and after
382
- % % https://github.com/erlang/otp/pull/5538
383
- {ok , {eldap_search_result , [], _Referrals }} ->
384
- [];
385
381
{ok , {eldap_search_result , [], _Referrals , _Controls }}->
386
382
[];
387
- {ok , {eldap_search_result , Entries , _Referrals }} ->
388
- [ON || # eldap_entry {object_name = ON } <- Entries ];
389
383
{ok , {eldap_search_result , Entries , _Referrals , _Controls }} ->
390
384
[ON || # eldap_entry {object_name = ON } <- Entries ]
391
385
end .
@@ -470,10 +464,6 @@ object_exists(DN, Filter, LDAP) ->
470
464
{scope , eldap :baseObject ()}]) of
471
465
{ok , {referral , Referrals }} ->
472
466
{error , {referrals_not_supported , Referrals }};
473
- % % support #eldap_search_result before and after
474
- % % https://github.com/erlang/otp/pull/5538
475
- {ok , {eldap_search_result , Entries , _Referrals }} ->
476
- length (Entries ) > 0 ;
477
467
{ok , {eldap_search_result , Entries , _Referrals , _Controls }} ->
478
468
length (Entries ) > 0 ;
479
469
{error , _ } = E ->
@@ -487,14 +477,8 @@ attribute(DN, AttributeName, LDAP) ->
487
477
{attributes , [AttributeName ]}]) of
488
478
{ok , {referral , Referrals }} ->
489
479
{error , {referrals_not_supported , Referrals }};
490
- % % support #eldap_search_result before and after
491
- % % https://github.com/erlang/otp/pull/5538
492
- {ok , {eldap_search_result , E = [# eldap_entry {}|_ ], _Referrals }} ->
493
- get_attributes (AttributeName , E );
494
480
{ok , {eldap_search_result , E = [# eldap_entry {}|_ ], _Referrals , _Controls }} ->
495
481
get_attributes (AttributeName , E );
496
- {ok , {eldap_search_result , _Entries , _Referrals }} ->
497
- {error , not_found };
498
482
{ok , {eldap_search_result , _Entries , _Referrals , _Controls }} ->
499
483
{error , not_found };
500
484
{error , _ } = E ->
@@ -890,18 +874,9 @@ dn_lookup(Username, LDAP) ->
890
874
{attributes , [" distinguishedName" ]}]) of
891
875
{ok , {referral , Referrals }} ->
892
876
{error , {referrals_not_supported , Referrals }};
893
- % % support #eldap_search_result before and after
894
- % % https://github.com/erlang/otp/pull/5538
895
- {ok , {eldap_search_result , [# eldap_entry {object_name = DN }], _Referrals }}->
896
- ? L1 (" DN lookup: ~ts -> ~ts " , [Username , DN ]),
897
- DN ;
898
877
{ok , {eldap_search_result , [# eldap_entry {object_name = DN }], _Referrals , _Controls }}->
899
878
? L1 (" DN lookup: ~ts -> ~ts " , [Username , DN ]),
900
879
DN ;
901
- {ok , {eldap_search_result , Entries , _Referrals }} ->
902
- rabbit_log_ldap :warning (" Searching for DN for ~ts , got back ~tp " ,
903
- [Filled , Entries ]),
904
- Filled ;
905
880
{ok , {eldap_search_result , Entries , _Referrals , _Controls }} ->
906
881
rabbit_log_ldap :warning (" Searching for DN for ~ts , got back ~tp " ,
907
882
[Filled , Entries ]),
0 commit comments