diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-08-29 15:24:14 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-09-20 13:04:10 +0200 |
| commit | 7074a1b7e0ddafa8f09a285cd9f3ae1f26d1709e (patch) | |
| tree | 00f4bf94130fe8ec662f2aa56dbc74a06018c8a2 /auth | |
| parent | 6ca2cfaff9d0b4203f6964d39a0930938a099e03 (diff) | |
| download | samba-7074a1b7e0ddafa8f09a285cd9f3ae1f26d1709e.tar.gz | |
CVE-2017-12150: auth/credentials: cli_credentials_authentication_requested() should check for NTLM_CCACHE/SIGN/SEAL
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12997
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/credentials/credentials.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c index 105c73c141b..4f3042e3152 100644 --- a/auth/credentials/credentials.c +++ b/auth/credentials/credentials.c @@ -25,6 +25,7 @@ #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */ #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_internal.h" +#include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "tevent.h" #include "param/param.h" @@ -300,6 +301,8 @@ _PUBLIC_ bool cli_credentials_set_principal_callback(struct cli_credentials *cre _PUBLIC_ bool cli_credentials_authentication_requested(struct cli_credentials *cred) { + uint32_t gensec_features = 0; + if (cred->bind_dn) { return true; } @@ -327,6 +330,19 @@ _PUBLIC_ bool cli_credentials_authentication_requested(struct cli_credentials *c return true; } + gensec_features = cli_credentials_get_gensec_features(cred); + if (gensec_features & GENSEC_FEATURE_NTLM_CCACHE) { + return true; + } + + if (gensec_features & GENSEC_FEATURE_SIGN) { + return true; + } + + if (gensec_features & GENSEC_FEATURE_SEAL) { + return true; + } + return false; } |