ldap_server: Add a ldapsrv debug class to log LDAP queries

Patch updated for recent samba versions in merge request #3295 by kvvloten
Initial patch created by Jeremy Allison (https://www.spinics.net/lists/samba/msg161128.html) to log LDAP server queries/functions in a separate file

Signed-off-by: Andréas Leroux <aleroux@tranquil.it>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Jul  9 08:37:22 UTC 2024 on atb-devel-224

diff --git a/docs-xml/smbdotconf/logging/loglevel.xml b/docs-xml/smbdotconf/logging/loglevel.xml
index 434c5d06832980e0a4ac5bc19d8c4faa370a0006..19ab2b77571d8e4329417ff11badb641eab592ef 100644 (file)
--- a/docs-xml/smbdotconf/logging/loglevel.xml
+++ b/docs-xml/smbdotconf/logging/loglevel.xml
@@ -57,6 +57,7 @@
        <listitem><para><parameter moreinfo="none">dsdb_transaction_json_audit</parameter></para></listitem>
        <listitem><para><parameter moreinfo="none">dsdb_group_audit</parameter></para></listitem>
        <listitem><para><parameter moreinfo="none">dsdb_group_json_audit</parameter></para></listitem>
+       <listitem><para><parameter moreinfo="none">ldapsrv</parameter></para></listitem>
     </itemizedlist>
 
     <para>Various modules register dynamic debug classes at first usage:</para>

diff --git a/lib/util/debug-classes/debug-classname-table.c b/lib/util/debug-classes/debug-classname-table.c
index 9062078165a9adae71c683a142fd2b1a21f8b653..b57bfc216b8d09f7d00c5108dca7a27511afba77 100644 (file)
--- a/lib/util/debug-classes/debug-classname-table.c
+++ b/lib/util/debug-classes/debug-classname-table.c
@@ -59,4 +59,5 @@ static const char *default_classname_table[] = {
        [DBGC_DSDB_TXN_AUDIT_JSON] =    "dsdb_transaction_json_audit",
        [DBGC_DSDB_GROUP_AUDIT] =       "dsdb_group_audit",
        [DBGC_DSDB_GROUP_AUDIT_JSON] =  "dsdb_group_json_audit",
+       [DBGC_LDAPSRV] =                "ldapsrv",
 };

diff --git a/lib/util/debug.h b/lib/util/debug.h
index 4687ac074b1f4aba23037dfae4af053d4f430639..a4ad56048ff54c7ac7a07f6ba2459477d5180ed0 100644 (file)
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -98,6 +98,7 @@ bool dbgsetclass(int level, int cls);
 #define DBGC_DSDB_TXN_AUDIT_JSON       35
 #define DBGC_DSDB_GROUP_AUDIT  36
 #define DBGC_DSDB_GROUP_AUDIT_JSON     37
+#define DBGC_LDAPSRV           38
 
 /* So you can define DBGC_CLASS before including debug.h */
 #ifndef DBGC_CLASS

diff --git a/python/samba/tests/logfiles.py b/python/samba/tests/logfiles.py
index 38c38045b8d7d30fb2547fea13653606e20804fd..e8fd4b0c5c4d365d4e8cecf647c6aa5234117933 100644 (file)
--- a/python/samba/tests/logfiles.py
+++ b/python/samba/tests/logfiles.py
@@ -33,7 +33,7 @@ CLASS_LIST = ["all", "tdb", "printdrivers", "lanman", "smb",
               "smb2", "smb2_credits", "dsdb_audit", "dsdb_json_audit",
               "dsdb_password_audit", "dsdb_password_json_audit",
               "dsdb_transaction_audit", "dsdb_transaction_json_audit",
-              "dsdb_group_audit", "dsdb_group_json_audit"]
+              "dsdb_group_audit", "dsdb_group_json_audit", "ldapsrv"]
 
 
 CLASS_CODES = {k: i for i, k in enumerate(CLASS_LIST)}

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 3aa7ac3821207e218781e3ed61141bc799c85894..986bc1db94172be73044a5bd133bf985a38c440f 100644 (file)
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -36,6 +36,9 @@
 #include "libcli/ldap/ldap_proto.h"
 #include "source4/auth/auth.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LDAPSRV
+
 static int map_ldb_error(TALLOC_CTX *mem_ctx, int ldb_err,
        const char *add_err_string, const char **errstring)
 {

diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 65e252edb702a4a1ef981933031ff61d766440ea..f9c7dce312f7658701a1e8c45d6a69530844686a 100644 (file)
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -32,6 +32,9 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "lib/util/time_basic.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LDAPSRV
+
 static char *ldapsrv_bind_error_msg(TALLOC_CTX *mem_ctx,
                                    HRESULT hresult,
                                    uint32_t DSID,

diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index a451050ea75beabb0e93d724ff90e5aaad498ef0..b4ea49169885d7189006ab122884e79731a83ecc 100644 (file)
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -26,6 +26,9 @@
 #include "librpc/gen_ndr/auth.h"
 #include "libcli/security/security_token.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LDAPSRV
+
 struct ldapsrv_starttls_postprocess_context {
        struct ldapsrv_connection *conn;
 };

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 90316fd6b68cd2578cd57e07235775fda0484497..3a91f6d4fc2449e5b3494357655d5c06dc16b7fe 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -54,6 +54,9 @@
 
 #undef strcasecmp
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LDAPSRV
+
 static void ldapsrv_terminate_connection_done(struct tevent_req *subreq);
 
 /*