From fe5dfc28a1377b6f9f92ad7a688e5da8a01a7cf8 Mon Sep 17 00:00:00 2001 From: kkplein Date: Mon, 18 Dec 2017 20:14:31 +0100 Subject: [PATCH 1/2] Update util.c --- source4/dsdb/common/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 49345e5ecde..3b416051ac1 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -5353,10 +5353,10 @@ NTSTATUS dsdb_update_bad_pwd_count(TALLOC_CTX *mem_ctx, TALLOC_FREE(mod_msg); return NT_STATUS_NO_MEMORY; } - DEBUG(5, ("Locked out user %s after %d wrong passwords\n", + DEBUGC( DBGC_AUTH, 1, ("Locked out user %s after %d wrong passwords\n", ldb_dn_get_linearized(user_msg->dn), badPwdCount)); } else { - DEBUG(5, ("Updated badPwdCount on %s after %d wrong passwords\n", + DEBUGC( DBGC_AUTH, 5, ("Updated badPwdCount on %s after %d wrong passwords\n", ldb_dn_get_linearized(user_msg->dn), badPwdCount)); } From 576e577fd8f74994367edd7594d73ddcd347b988 Mon Sep 17 00:00:00 2001 From: kkplein Date: Tue, 19 Dec 2017 10:49:10 +0100 Subject: [PATCH 2/2] define DBGC_AUTH class --- auth/credentials/credentials_krb5.c | 3 +++ auth/credentials/credentials_ntlm.c | 3 +++ auth/credentials/credentials_secrets.c | 3 +++ auth/gensec/external.c | 3 +++ auth/gensec/gensec.c | 3 +++ auth/gensec/gensec_start.c | 3 +++ auth/gensec/gensec_util.c | 3 +++ auth/gensec/ncalrpc.c | 3 +++ auth/gensec/schannel.c | 3 +++ auth/gensec/spnego.c | 3 +++ auth/kerberos/gssapi_helper.c | 3 +++ auth/kerberos/gssapi_pac.c | 4 ++++ auth/kerberos/kerberos_pac.c | 4 ++++ auth/ntlmssp/gensec_ntlmssp_server.c | 3 +++ auth/ntlmssp/ntlmssp.c | 3 +++ auth/ntlmssp/ntlmssp_client.c | 3 +++ auth/ntlmssp/ntlmssp_server.c | 3 +++ auth/ntlmssp/ntlmssp_sign.c | 3 +++ auth/ntlmssp/ntlmssp_util.c | 3 +++ 19 files changed, 59 insertions(+) diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c index b88497dcace..2cfbc245be9 100644 --- a/auth/credentials/credentials_krb5.c +++ b/auth/credentials/credentials_krb5.c @@ -35,6 +35,9 @@ #include "auth/kerberos/pac_utils.h" #include "param/param.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + static void cli_credentials_invalidate_client_gss_creds( struct cli_credentials *cred, enum credentials_obtained obtained); diff --git a/auth/credentials/credentials_ntlm.c b/auth/credentials/credentials_ntlm.c index e6859bf9c45..eed8924567a 100644 --- a/auth/credentials/credentials_ntlm.c +++ b/auth/credentials/credentials_ntlm.c @@ -28,6 +28,9 @@ #include "auth/credentials/credentials.h" #include "auth/credentials/credentials_internal.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + _PUBLIC_ NTSTATUS cli_credentials_get_ntlm_response(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, int *flags, DATA_BLOB challenge, diff --git a/auth/credentials/credentials_secrets.c b/auth/credentials/credentials_secrets.c index ed148fd3566..beb292848ad 100644 --- a/auth/credentials/credentials_secrets.c +++ b/auth/credentials/credentials_secrets.c @@ -41,6 +41,9 @@ #include "lib/util/util_tdb.h" #include "libds/common/roles.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /** * Fill in credentials for the machine trust account, from the secrets database. * diff --git a/auth/gensec/external.c b/auth/gensec/external.c index 01580456794..300ce6b5cb3 100644 --- a/auth/gensec/external.c +++ b/auth/gensec/external.c @@ -28,6 +28,9 @@ #include "auth/gensec/gensec_proto.h" #include "auth/gensec/gensec_toplevel_proto.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /* SASL/EXTERNAL is essentially a no-op; it is only usable when the transport * layer is already mutually authenticated. */ diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c index 61bff225450..e021d0ce3fe 100644 --- a/auth/gensec/gensec.c +++ b/auth/gensec/gensec.c @@ -31,6 +31,9 @@ #include "librpc/gen_ndr/dcerpc.h" #include "auth/common_auth.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + _PRIVATE_ NTSTATUS gensec_may_reset_crypto(struct gensec_security *gensec_security, bool full_reset) { diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c index 42766200a59..50f4de73110 100644 --- a/auth/gensec/gensec_start.c +++ b/auth/gensec/gensec_start.c @@ -33,6 +33,9 @@ #include "lib/util/samba_modules.h" #include "lib/util/base64.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /* the list of currently registered GENSEC backends */ static const struct gensec_security_ops **generic_security_ops; static int gensec_num_backends; diff --git a/auth/gensec/gensec_util.c b/auth/gensec/gensec_util.c index ca5e581f63f..20c9c2a1fbb 100644 --- a/auth/gensec/gensec_util.c +++ b/auth/gensec/gensec_util.c @@ -26,6 +26,9 @@ #include "auth/common_auth.h" #include "../lib/util/asn1.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + NTSTATUS gensec_generate_session_info_pac(TALLOC_CTX *mem_ctx, struct gensec_security *gensec_security, struct smb_krb5_context *smb_krb5_context, diff --git a/auth/gensec/ncalrpc.c b/auth/gensec/ncalrpc.c index 70b3bb5ea39..7474b6aff9b 100644 --- a/auth/gensec/ncalrpc.c +++ b/auth/gensec/ncalrpc.c @@ -30,6 +30,9 @@ #include "lib/param/param.h" #include "tsocket.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + _PUBLIC_ NTSTATUS gensec_ncalrpc_as_system_init(TALLOC_CTX *ctx); struct gensec_ncalrpc_state { diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c index 8e58e73cacd..71e9afdf48e 100644 --- a/auth/gensec/schannel.c +++ b/auth/gensec/schannel.c @@ -36,6 +36,9 @@ #include "lib/crypto/crypto.h" #include "libds/common/roles.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + struct schannel_state { struct gensec_security *gensec; uint64_t seq_num; diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c index 9857e78184b..56f9be412ab 100644 --- a/auth/gensec/spnego.c +++ b/auth/gensec/spnego.c @@ -34,6 +34,9 @@ #include "lib/util/asn1.h" #include "lib/util/base64.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + #undef strcasecmp _PUBLIC_ NTSTATUS gensec_spnego_init(TALLOC_CTX *ctx); diff --git a/auth/kerberos/gssapi_helper.c b/auth/kerberos/gssapi_helper.c index b7ffb6ca9ff..52c953c07ab 100644 --- a/auth/kerberos/gssapi_helper.c +++ b/auth/kerberos/gssapi_helper.c @@ -23,6 +23,9 @@ #include "auth/kerberos/pac_utils.h" #include "auth/kerberos/gssapi_helper.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + size_t gssapi_get_sig_size(gss_ctx_id_t gssapi_context, const gss_OID mech, uint32_t gss_want_flags, diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c index 253976aecdf..b695671c95f 100644 --- a/auth/kerberos/gssapi_pac.c +++ b/auth/kerberos/gssapi_pac.c @@ -19,6 +19,10 @@ */ #include "includes.h" + +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + #ifdef HAVE_KRB5 #include "auth/kerberos/pac_utils.h" diff --git a/auth/kerberos/kerberos_pac.c b/auth/kerberos/kerberos_pac.c index 7b6efdc8db0..0ab0e9a4594 100644 --- a/auth/kerberos/kerberos_pac.c +++ b/auth/kerberos/kerberos_pac.c @@ -23,6 +23,10 @@ */ #include "includes.h" + +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + #ifdef HAVE_KRB5 #include "librpc/gen_ndr/ndr_krb5pac.h" diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c index 561c7cff5bd..c0e6cff5952 100644 --- a/auth/ntlmssp/gensec_ntlmssp_server.c +++ b/auth/ntlmssp/gensec_ntlmssp_server.c @@ -37,6 +37,9 @@ #include "param/loadparm.h" #include "libds/common/roles.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /** * Return the credentials of a logged on user, including session keys * etc. diff --git a/auth/ntlmssp/ntlmssp.c b/auth/ntlmssp/ntlmssp.c index 36e7052793f..37434fbb0c2 100644 --- a/auth/ntlmssp/ntlmssp.c +++ b/auth/ntlmssp/ntlmssp.c @@ -33,6 +33,9 @@ struct auth_session_info; #include "auth/gensec/gensec.h" #include "auth/gensec/gensec_internal.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /** * Callbacks for NTLMSSP - for both client and server operating modes * diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c index 5edd5f4fce6..db2003f0d6b 100644 --- a/auth/ntlmssp/ntlmssp_client.c +++ b/auth/ntlmssp/ntlmssp_client.c @@ -36,6 +36,9 @@ struct auth_session_info; #include "../auth/ntlmssp/ntlmssp_ndr.h" #include "../nsswitch/libwbclient/wbclient.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /********************************************************************* Client side NTLMSSP *********************************************************************/ diff --git a/auth/ntlmssp/ntlmssp_server.c b/auth/ntlmssp/ntlmssp_server.c index 417352bf259..37ed2bc9565 100644 --- a/auth/ntlmssp/ntlmssp_server.c +++ b/auth/ntlmssp/ntlmssp_server.c @@ -37,6 +37,9 @@ #include "param/loadparm.h" #include "libcli/security/session.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + /** * Determine correct target name flags for reply, given server role * and negotiated flags diff --git a/auth/ntlmssp/ntlmssp_sign.c b/auth/ntlmssp/ntlmssp_sign.c index ad0f9e96d32..09b7e5ab923 100644 --- a/auth/ntlmssp/ntlmssp_sign.c +++ b/auth/ntlmssp/ntlmssp_sign.c @@ -26,6 +26,9 @@ #include "../lib/crypto/crc32.h" #include "../auth/ntlmssp/ntlmssp_private.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + #define CLI_SIGN "session key to client-to-server signing key magic constant" #define CLI_SEAL "session key to client-to-server sealing key magic constant" #define SRV_SIGN "session key to server-to-client signing key magic constant" diff --git a/auth/ntlmssp/ntlmssp_util.c b/auth/ntlmssp/ntlmssp_util.c index 9c7325a23e0..6f3b474fd71 100644 --- a/auth/ntlmssp/ntlmssp_util.c +++ b/auth/ntlmssp/ntlmssp_util.c @@ -25,6 +25,9 @@ #include "../auth/ntlmssp/ntlmssp.h" #include "../auth/ntlmssp/ntlmssp_private.h" +#undef DBGC_CLASS +#define DBGC_CLASS DBGC_AUTH + static void debug_ntlmssp_flags_raw(int level, uint32_t flags) { #define _PRINT_FLAG_LINE(v) do { \