mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 08:38:20 +00:00
Merge remote-tracking branch 'origin/topic/awelzel/4275-ldap-gss-spnego-auth-miss'
* origin/topic/awelzel/4275-ldap-gss-spnego-auth-miss:
ldap: Clean up from code review
ldap: Add Sicily Authentication constants
ldap: Only switch into MS_KRB5 mode if responseToken exists
(cherry picked from commit a2a535d0c9
)
This commit is contained in:
parent
ec18da8baa
commit
ceb798b42a
11 changed files with 113 additions and 16 deletions
|
@ -372,13 +372,23 @@ event LDAP::bind_request(c: connection,
|
|||
if ( m?$opcode )
|
||||
Reporter::conn_weird("LDAP_bind_opcode_already_set", c, m$opcode, "LDAP");
|
||||
|
||||
if (authType == LDAP::BindAuthType_BIND_AUTH_SIMPLE) {
|
||||
switch ( authType ) {
|
||||
case LDAP::BindAuthType_BIND_AUTH_SIMPLE:
|
||||
m$opcode = BIND_SIMPLE;
|
||||
} else if (authType == LDAP::BindAuthType_BIND_AUTH_SASL) {
|
||||
break;
|
||||
case LDAP::BindAuthType_BIND_AUTH_SASL:
|
||||
m$opcode = BIND_SASL;
|
||||
} else {
|
||||
break;
|
||||
case LDAP::BindAuthType_SICILY_NEGOTIATE:
|
||||
m$opcode = BIND_SICILY_NEGOTIATE;
|
||||
break;
|
||||
case LDAP::BindAuthType_SICILY_RESPONSE:
|
||||
m$opcode = BIND_SICILY_RESPONSE;
|
||||
break;
|
||||
default:
|
||||
Reporter::conn_weird("LDAP_unknown_auth_type", c, cat(authType), "LDAP");
|
||||
m$opcode = cat(authType);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue