[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri Dec 29 13:51:01 UTC 2023
The branch, master has been updated
via bab0ac776ca s4/ldap_backend: do_call: use modern DBG macros
via 80c2513da4c s4/ldap_backend: abandonrequest: use modern DBG macros
via 70a5309bf1f s4/ldap_backend: CompareRequest: use modern DBG macros
via 24a01b673cc s4/ldap_backend: modifydnrequest: use modern DBG macros
via 2a4d291e824 s4/ldap_backend: delrequest: use modern DBG macros
via 9129042eb0a s4/ldap_backend: addrequest: use modern DBG macros
via ac3ed2486b7 s4/ldap_backend: modifyrequest: use modern DBG_ macro
via 6d4bb12c49c s4/ldap_backend: SearchRequest: use modern DBG_ macro
via 54a88491e5f s4/ldap_backend: unwilling: use modern DBG_ macro
via 1324732e801 s4/ldap_backend: encode: use modern DBG_ macro
via 10002e94009 s4/ldap_backend: change a printf %d to %u for results
via d4168fce7b0 s4/ldap_backend: fix a NULL dereference
via b41f95f891a winbind_nss_netbsd: fix missing semicolon
via b9f32b32e0e docs-xml: use XML_CATALOG_FILES env var if defined
via 2073bbf9dca doc-xml: fix name of vfs_linux_xfs man page
from 5f5a49d78af lib:crypto: Add tests for GKDI key derivation
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bab0ac776cad50452e42d3c418b60a1635111935
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:48:35 2023 +0100
s4/ldap_backend: do_call: use modern DBG macros
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Fri Dec 29 13:50:05 UTC 2023 on atb-devel-224
commit 80c2513da4c4f414e4ab88ad1ba3f1e59657391c
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:46:47 2023 +0100
s4/ldap_backend: abandonrequest: use modern DBG macros
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 70a5309bf1f526cd3c00d303570ab7e7d6f15e7a
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:45:55 2023 +0100
s4/ldap_backend: CompareRequest: use modern DBG macros
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 24a01b673cc1002e16cc806d600acbef0856ea54
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:37:29 2023 +0100
s4/ldap_backend: modifydnrequest: use modern DBG macros
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 2a4d291e8246058ef8818b56c9861a3eed49cad4
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:34:28 2023 +0100
s4/ldap_backend: delrequest: use modern DBG macros
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 9129042eb0a19d922ce77e8f51af204fd41ca6bc
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:32:49 2023 +0100
s4/ldap_backend: addrequest: use modern DBG macros
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit ac3ed2486b793865133d2006031ccf4a2c37458b
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:31:27 2023 +0100
s4/ldap_backend: modifyrequest: use modern DBG_ macro
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 6d4bb12c49cde2bc8d14712e3563b32038c6ae45
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:26:58 2023 +0100
s4/ldap_backend: SearchRequest: use modern DBG_ macro
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 54a88491e5fb1ec949960fad426e9ee51a68fe2f
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:24:13 2023 +0100
s4/ldap_backend: unwilling: use modern DBG_ macro
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 1324732e8013b8ff5833799e86f9fd8f10e3ea41
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 21:22:48 2023 +0100
s4/ldap_backend: encode: use modern DBG_ macro
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 10002e94009dc132867e3100c86fd351ce93bc99
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 20:37:38 2023 +0100
s4/ldap_backend: change a printf %d to %u for results
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit d4168fce7b07f417c81c801da0fd664fbb90715a
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 20:30:43 2023 +0100
s4/ldap_backend: fix a NULL dereference
Signed-off-by: Bjoern Jacke <bjacke at samba.org>>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit b41f95f891ab5b1d1878735a513be5d9a13f63c6
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 19:53:30 2023 +0100
winbind_nss_netbsd: fix missing semicolon
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15541
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit b9f32b32e0e1463b8ca3e696d682ecf86503464b
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 19:50:55 2023 +0100
docs-xml: use XML_CATALOG_FILES env var if defined
Thanks to Thierry LARONDE for the fix.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15540
Signed-off-by: Björn Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 2073bbf9dcab5fabe5e683c12e16c195239fcba1
Author: Björn Jacke <bjacke at samba.org>
Date: Mon Dec 25 19:49:38 2023 +0100
doc-xml: fix name of vfs_linux_xfs man page
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15542
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/wafsamba.py | 2 +-
docs-xml/manpages/vfs_linux_xfs_sgid.8.xml | 4 +-
nsswitch/winbind_nss_netbsd.c | 2 +-
source4/ldap_server/ldap_backend.c | 68 ++++++++++++++----------------
4 files changed, 36 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 858458ae2af..3d6bbb84f6d 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -1178,7 +1178,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'
- bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
+ bld.env.SAMBA_CATALOGS = os.getenv('XML_CATALOG_FILES', 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog') + ' file://' + bld.env.SAMBA_CATALOG
for m in manpages.split():
source = [m + '.xml']
diff --git a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
index 73820339a9b..a0117dc17b3 100644
--- a/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
+++ b/docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
@@ -3,7 +3,7 @@
<refentry id="vfs_linux_xfs_sgid.8">
<refmeta>
- <refentrytitle>vfs_syncops</refentrytitle>
+ <refentrytitle>vfs_linux_xfs_sgid</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
@@ -49,7 +49,7 @@
<refsect1>
<title>EXAMPLES</title>
- <para>Add syncops functionality for [share]:</para>
+ <para>Add linux_xfs_sgid functionality for [share]:</para>
<programlisting>
<smbconfsection name="[share]"/>
<smbconfoption name="vfs objects">linux_xfs_sgid</smbconfoption>
diff --git a/nsswitch/winbind_nss_netbsd.c b/nsswitch/winbind_nss_netbsd.c
index 94552639b7b..473fa50037c 100644
--- a/nsswitch/winbind_nss_netbsd.c
+++ b/nsswitch/winbind_nss_netbsd.c
@@ -185,7 +185,7 @@ netbsdwinbind_getgroupmembership(void *nsrv, void *nscb, va_list ap)
};
struct winbindd_response response = {
.length = 0,
- }
+ };
gid_t *wblistv;
int wblistc, i, isdup, dupc;
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 4e94417c21b..1a906534a0a 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -288,14 +288,15 @@ static NTSTATUS ldapsrv_encode(TALLOC_CTX *mem_ctx,
samba_ldap_control_handlers(),
&reply->blob,
mem_ctx);
- TALLOC_FREE(reply->msg);
if (!bret) {
- DEBUG(0,("Failed to encode ldap reply of type %d: "
+ DBG_ERR("Failed to encode ldap reply of type %d: "
"ldap_encode() failed\n",
- reply->msg->type));
+ reply->msg->type);
+ TALLOC_FREE(reply->msg);
return NT_STATUS_NO_MEMORY;
}
+ TALLOC_FREE(reply->msg);
talloc_set_name_const(reply->blob.data,
"Outgoing, encoded single LDAP reply");
@@ -352,7 +353,7 @@ static NTSTATUS ldapsrv_unwilling(struct ldapsrv_call *call, int error)
struct ldapsrv_reply *reply;
struct ldap_ExtendedResponse *r;
- DEBUG(10,("Unwilling type[%d] id[%d]\n", call->request->type, call->request->messageid));
+ DBG_DEBUG("type[%d] id[%d]\n", call->request->type, call->request->messageid);
reply = ldapsrv_init_reply(call, LDAP_TAG_ExtendedResponse);
if (!reply) {
@@ -789,21 +790,21 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
}
scope_str = dsdb_search_scope_as_string(scope);
- DEBUG(10,("SearchRequest: scope: [%s]\n", scope_str));
+ DBG_DEBUG("scope: [%s]\n", scope_str);
if (req->num_attributes >= 1) {
attrs = talloc_array(local_ctx, const char *, req->num_attributes+1);
NT_STATUS_HAVE_NO_MEMORY(attrs);
for (i=0; i < req->num_attributes; i++) {
- DEBUG(10,("SearchRequest: attrs: [%s]\n",req->attributes[i]));
+ DBG_DEBUG("attrs: [%s]\n",req->attributes[i]);
attrs[i] = req->attributes[i];
}
attrs[i] = NULL;
}
- DEBUG(5,("ldb_request %s dn=%s filter=%s\n",
- scope_str, req->basedn, ldb_filter_from_tree(call, req->tree)));
+ DBG_INFO("ldb_request %s dn=%s filter=%s\n",
+ scope_str, req->basedn, ldb_filter_from_tree(call, req->tree));
callback_ctx = talloc_zero(local_ctx, struct ldapsrv_context);
NT_STATUS_HAVE_NO_MEMORY(callback_ctx);
@@ -862,7 +863,7 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
}
if (count >= call->conn->limits.max_notifications) {
- DEBUG(10,("SearchRequest: error MaxNotificationPerConn\n"));
+ DBG_DEBUG("error MaxNotificationPerConn\n");
result = map_ldb_error(local_ctx,
LDB_ERR_ADMIN_LIMIT_EXCEEDED,
"MaxNotificationPerConn reached",
@@ -1028,7 +1029,7 @@ reply:
}
result = LDB_SUCCESS;
} else {
- DEBUG(10,("SearchRequest: error\n"));
+ DBG_DEBUG("error\n");
result = map_ldb_error(local_ctx, ldb_ret, ldb_errstring(samdb),
&errstr);
}
@@ -1056,8 +1057,7 @@ static NTSTATUS ldapsrv_ModifyRequest(struct ldapsrv_call *call)
unsigned int i,j;
struct ldb_result *res = NULL;
- DEBUG(10, ("ModifyRequest"));
- DEBUGADD(10, (" dn: %s\n", req->dn));
+ DBG_DEBUG("dn: %s\n", req->dn);
local_ctx = talloc_named(call, 0, "ModifyRequest local memory context");
NT_STATUS_HAVE_NO_MEMORY(local_ctx);
@@ -1065,7 +1065,7 @@ static NTSTATUS ldapsrv_ModifyRequest(struct ldapsrv_call *call)
dn = ldb_dn_new(local_ctx, samdb, req->dn);
NT_STATUS_HAVE_NO_MEMORY(dn);
- DEBUG(10, ("ModifyRequest: dn: [%s]\n", req->dn));
+ DBG_DEBUG("dn: [%s]\n", req->dn);
msg = ldb_msg_new(local_ctx);
NT_STATUS_HAVE_NO_MEMORY(msg);
@@ -1161,8 +1161,7 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
unsigned int i,j;
struct ldb_result *res = NULL;
- DEBUG(10, ("AddRequest"));
- DEBUGADD(10, (" dn: %s\n", req->dn));
+ DBG_DEBUG("dn: %s\n", req->dn);
local_ctx = talloc_named(call, 0, "AddRequest local memory context");
NT_STATUS_HAVE_NO_MEMORY(local_ctx);
@@ -1170,7 +1169,7 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
dn = ldb_dn_new(local_ctx, samdb, req->dn);
NT_STATUS_HAVE_NO_MEMORY(dn);
- DEBUG(10, ("AddRequest: dn: [%s]\n", req->dn));
+ DBG_DEBUG("dn: [%s]\n", req->dn);
msg = talloc(local_ctx, struct ldb_message);
NT_STATUS_HAVE_NO_MEMORY(msg);
@@ -1247,8 +1246,7 @@ static NTSTATUS ldapsrv_DelRequest(struct ldapsrv_call *call)
int ldb_ret;
struct ldb_result *res = NULL;
- DEBUG(10, ("DelRequest"));
- DEBUGADD(10, (" dn: %s\n", req->dn));
+ DBG_DEBUG("dn: %s\n", req->dn);
local_ctx = talloc_named(call, 0, "DelRequest local memory context");
NT_STATUS_HAVE_NO_MEMORY(local_ctx);
@@ -1256,7 +1254,7 @@ static NTSTATUS ldapsrv_DelRequest(struct ldapsrv_call *call)
dn = ldb_dn_new(local_ctx, samdb, req->dn);
NT_STATUS_HAVE_NO_MEMORY(dn);
- DEBUG(10, ("DelRequest: dn: [%s]\n", req->dn));
+ DBG_DEBUG("dn: [%s]\n", req->dn);
del_reply = ldapsrv_init_reply(call, LDAP_TAG_DelResponse);
NT_STATUS_HAVE_NO_MEMORY(del_reply);
@@ -1302,9 +1300,8 @@ static NTSTATUS ldapsrv_ModifyDNRequest(struct ldapsrv_call *call)
int ldb_ret;
struct ldb_result *res = NULL;
- DEBUG(10, ("ModifyDNRequest"));
- DEBUGADD(10, (" dn: %s", req->dn));
- DEBUGADD(10, (" newrdn: %s\n", req->newrdn));
+ DBG_DEBUG("dn: %s newrdn: %s\n",
+ req->dn, req->newrdn);
local_ctx = talloc_named(call, 0, "ModifyDNRequest local memory context");
NT_STATUS_HAVE_NO_MEMORY(local_ctx);
@@ -1315,8 +1312,8 @@ static NTSTATUS ldapsrv_ModifyDNRequest(struct ldapsrv_call *call)
newrdn = ldb_dn_new(local_ctx, samdb, req->newrdn);
NT_STATUS_HAVE_NO_MEMORY(newrdn);
- DEBUG(10, ("ModifyDNRequest: olddn: [%s]\n", req->dn));
- DEBUG(10, ("ModifyDNRequest: newrdn: [%s]\n", req->newrdn));
+ DBG_DEBUG("olddn: [%s] newrdn: [%s]\n",
+ req->dn, req->newrdn);
if (ldb_dn_get_comp_num(newrdn) == 0) {
result = LDAP_PROTOCOL_ERROR;
@@ -1343,7 +1340,7 @@ static NTSTATUS ldapsrv_ModifyDNRequest(struct ldapsrv_call *call)
}
if (req->newsuperior) {
- DEBUG(10, ("ModifyDNRequest: newsuperior: [%s]\n", req->newsuperior));
+ DBG_DEBUG("newsuperior: [%s]\n", req->newsuperior);
parentdn = ldb_dn_new(local_ctx, samdb, req->newsuperior);
}
@@ -1409,8 +1406,7 @@ static NTSTATUS ldapsrv_CompareRequest(struct ldapsrv_call *call)
int result = LDAP_SUCCESS;
int ldb_ret;
- DEBUG(10, ("CompareRequest"));
- DEBUGADD(10, (" dn: %s\n", req->dn));
+ DBG_DEBUG("dn: %s\n", req->dn);
local_ctx = talloc_named(call, 0, "CompareRequest local_memory_context");
NT_STATUS_HAVE_NO_MEMORY(local_ctx);
@@ -1418,12 +1414,12 @@ static NTSTATUS ldapsrv_CompareRequest(struct ldapsrv_call *call)
dn = ldb_dn_new(local_ctx, samdb, req->dn);
NT_STATUS_HAVE_NO_MEMORY(dn);
- DEBUG(10, ("CompareRequest: dn: [%s]\n", req->dn));
+ DBG_DEBUG("dn: [%s]\n", req->dn);
filter = talloc_asprintf(local_ctx, "(%s=%*s)", req->attribute,
(int)req->value.length, req->value.data);
NT_STATUS_HAVE_NO_MEMORY(filter);
- DEBUGADD(10, ("CompareRequest: attribute: [%s]\n", filter));
+ DBG_DEBUG("attribute: [%s]\n", filter);
attrs[0] = NULL;
@@ -1436,13 +1432,13 @@ static NTSTATUS ldapsrv_CompareRequest(struct ldapsrv_call *call)
if (ldb_ret != LDB_SUCCESS) {
result = map_ldb_error(local_ctx, ldb_ret,
ldb_errstring(samdb), &errstr);
- DEBUG(10,("CompareRequest: error: %s\n", errstr));
+ DBG_DEBUG("error: %s\n", errstr);
} else if (res->count == 0) {
- DEBUG(10,("CompareRequest: doesn't matched\n"));
+ DBG_DEBUG("didn't match\n");
result = LDAP_COMPARE_FALSE;
errstr = NULL;
} else if (res->count == 1) {
- DEBUG(10,("CompareRequest: matched\n"));
+ DBG_DEBUG("matched\n");
result = LDAP_COMPARE_TRUE;
errstr = NULL;
} else if (res->count > 1) {
@@ -1450,7 +1446,7 @@ static NTSTATUS ldapsrv_CompareRequest(struct ldapsrv_call *call)
map_ldb_error(local_ctx, LDB_ERR_OTHER, NULL, &errstr);
errstr = talloc_asprintf(local_ctx,
"%s. Too many objects match!", errstr);
- DEBUG(10,("CompareRequest: %d results: %s\n", res->count, errstr));
+ DBG_DEBUG("%u results: %s\n", res->count, errstr);
}
}
@@ -1471,7 +1467,7 @@ static NTSTATUS ldapsrv_AbandonRequest(struct ldapsrv_call *call)
struct ldapsrv_call *c = NULL;
struct ldapsrv_call *n = NULL;
- DEBUG(10, ("AbandonRequest\n"));
+ DBG_DEBUG("abandoned\n");
for (c = call->conn->pending_calls; c != NULL; c = n) {
n = c->next;
@@ -1534,8 +1530,8 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
for (i=0; msg->controls && msg->controls[i]; i++) {
if (!msg->controls_decoded[i] &&
msg->controls[i]->critical) {
- DEBUG(3, ("ldapsrv_do_call: Critical extension %s is not known to this server\n",
- msg->controls[i]->oid));
+ DBG_NOTICE("Critical extension %s is not known to this server\n",
+ msg->controls[i]->oid);
return ldapsrv_unwilling(call, LDAP_UNAVAILABLE_CRITICAL_EXTENSION);
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list