The branch, master has been updated
via 0835fe53cc7 lib: Introduce cp_smb_basename() helper function
via 47edf9b5f60 smbd: Move file_fsp() to smb1_utils.c
via 016c36ae7d3 dfs_server: Modernize DEBUGs
via 44040ebab29 dfs_server: Use talloc_asprintf_strlower_m()
via bad81deaa66 lib: Fix trailing whitespace
via 983694695f0 smbd: Save lines in conn_new()
via d1309083d38 examples: Fix trailing whitespace
via 2aeecbfb6fe smbd: Fix some whitespace
via b99258065e4 smbd: Replace a ZERO_STRUCT with a direct struct
initialization
via 0dd41394e39 vfs: Fix trailing whitespace
via ff5649a25ed smbd: README.Coding for file_name_hash()
via 00331d773c2 smbd: Modernize a DEBUG
via e93c5615027 smbd: Make file_name_hash() static
via 16ab4778785 vfs: Remove some code duplication
via 5a4ca24842f auth: Simplify check_account()
via 1416ad9d665 lib: Fix whitespace
via c479d78e817 smbd: Fix a typo
via 5d8b8d1b27a samr_server: Remove an obsolete and confusing comment
via 7f618ef8db9 lib: Add some const to bitmap functions
via 82350f36d6b lib: Fix bitmap_talloc()'s parameter to unsigned
via fb2058c9ccd lib: Simplify num_parameters() with ARRAY_SIZE()
via 11b89dd4293 lib: "boolean == true" looks strange :-)
via 6703c8237a5 lib: Remove some unused code #ifdef'ed out for more
than 10 years
via 6b1e28cf8ea lib: Remove an ancient prototype
via fd049cd50ae smbd: Fix a few possible buffer read overruns
via eb2f3c29b5b smbd: Modernize DEBUGs
via 40a23349643 smbd: Fix a comment
via cb2a145c2e2 lib: Remove duplicate #define of TALLOC_FREE()
via ffb895b51be s3: Remove TALLOC_REALLOC() macro
via 38b76366888 s3: talloc_destroy() -> TALLOC_FREE()
via c7c533bdc9f s3: Replace TALLOC_SIZE() with talloc_size()
via 1af249f6c7f vfs: Fix trailing whitespace
via d5b66d23d80 s3: Remove the now-unused TALLOC() macro
via 1f818eba76b s3: Replace a few calls to TALLOC() with talloc_size()
via 2445d9a9b5b s3: Replace a few calls to TALLOC() with talloc_array()
via dd8fff458e1 printing: Fix trailing whitespace
via c929fc5dfbf smbd: Remove an obsolete comment
via 355efdc0ee4 smbd: Make get_real_filename_full_scan_at() static
via fda76086515 vfs: Simplify vfs_gpfs_get_real_filename_at()
via 6bf3c55ca3b smbd: Remove an unused struct member
via 84be9587a7a vfs: Remove audit_file function
via 095716c0b08 vfs: Remove connectpath function
via 2553d4f6378 vfs: Fix smb_full_audit_parent_pathname()
from 6ee03a2bd9b s3:winbind: Improve logging for query_user_list()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0835fe53cc719a249a86319faabefd413d91d861
Author: Volker Lendecke <[email protected]>
Date: Sat Nov 8 10:37:55 2025 +0100
lib: Introduce cp_smb_basename() helper function
I always had to look up the sequence of NULLs and 0s. Save lines.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon Nov 10 14:33:28 UTC 2025 on atb-devel-224
commit 47edf9b5f60f68057770de8d8f0d262458be9191
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 23 17:18:16 2025 +0200
smbd: Move file_fsp() to smb1_utils.c
16-bit file ids are a smb1 thing
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 016c36ae7d3f7bb984e3e30585a09dce509354e3
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 20 20:24:06 2025 +0200
dfs_server: Modernize DEBUGs
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 44040ebab29f2671ec4e15d20a7258cedde40cdc
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 20 18:08:12 2025 +0200
dfs_server: Use talloc_asprintf_strlower_m()
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit bad81deaa6602e6dc1fda1147f87ec43cc2f207a
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 20 17:42:40 2025 +0200
lib: Fix trailing whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 983694695f0c703aa9b3af2449ff4631cecc0be2
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 20 16:35:09 2025 +0200
smbd: Save lines in conn_new()
"nomem" is the only failure condition here
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit d1309083d38deebfebd3608da652a775845f15e0
Author: Volker Lendecke <[email protected]>
Date: Sun Oct 19 12:02:14 2025 +0200
examples: Fix trailing whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 2aeecbfb6fefee8939ea6ac9ba8526c1e137a4a9
Author: Volker Lendecke <[email protected]>
Date: Wed Oct 22 11:15:08 2025 +0200
smbd: Fix some whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit b99258065e408a03c9e46ee69af7079a82067224
Author: Volker Lendecke <[email protected]>
Date: Wed Oct 22 11:13:18 2025 +0200
smbd: Replace a ZERO_STRUCT with a direct struct initialization
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 0dd41394e39bbc0d58847db687ad194f27643485
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 23 20:45:04 2025 +0200
vfs: Fix trailing whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit ff5649a25ed00b5e6f9e0ad11d78467b493fc389
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 23 19:26:27 2025 +0200
smbd: README.Coding for file_name_hash()
Initialize pointers
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 00331d773c2cc3a6fc3a428ee46e8ccdc6097d66
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 23 19:24:42 2025 +0200
smbd: Modernize a DEBUG
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit e93c5615027be1b5f9f7290c4fdd5dd3c535841e
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 23 19:22:03 2025 +0200
smbd: Make file_name_hash() static
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 16ab4778785cff757cde23d106f062101f3cde9b
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 23 18:53:11 2025 +0200
vfs: Remove some code duplication
We do the chdir in both cases
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 5a4ca24842fcddc3e46e7491e976e56c1210cf80
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 16 13:07:23 2025 +0200
auth: Simplify check_account()
We have strlower_talloc() for this
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 1416ad9d66597543539ebdf57d01b4b9877aaa5e
Author: Volker Lendecke <[email protected]>
Date: Thu Oct 16 12:54:14 2025 +0200
lib: Fix whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit c479d78e81769612af40222874f2d66f2db70318
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 13 18:48:11 2025 +0200
smbd: Fix a typo
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 5d8b8d1b27a04f45e791654e2c7d62d29a22bc21
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 13 18:24:34 2025 +0200
samr_server: Remove an obsolete and confusing comment
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 7f618ef8db916ba1ef65c04e185457de59f3ace1
Author: Volker Lendecke <[email protected]>
Date: Wed Oct 29 13:45:18 2025 +0100
lib: Add some const to bitmap functions
The unusual use of const comes from bitmap_copy :-)
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 82350f36d6b2e0bb230c1e9623990d3d3e6bbddd
Author: Volker Lendecke <[email protected]>
Date: Wed Oct 29 13:41:30 2025 +0100
lib: Fix bitmap_talloc()'s parameter to unsigned
It does not make sense to allocate a negative number of bits
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit fb2058c9ccd615e22cfad00840d2097dee6b803c
Author: Volker Lendecke <[email protected]>
Date: Wed Oct 29 13:39:38 2025 +0100
lib: Simplify num_parameters() with ARRAY_SIZE()
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 11b89dd42931a3377b29ecaefd8942d813917374
Author: Volker Lendecke <[email protected]>
Date: Sun Sep 21 14:36:37 2025 +0200
lib: "boolean == true" looks strange :-)
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 6703c8237a56e7f7910774aa00732af51f918dee
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 19 14:02:57 2025 -0700
lib: Remove some unused code #ifdef'ed out for more than 10 years
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 6b1e28cf8eadd242147f21d4948b40781c227fef
Author: Volker Lendecke <[email protected]>
Date: Fri Sep 19 13:50:13 2025 -0700
lib: Remove an ancient prototype
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit fd049cd50aed17759570e312970a2ef60059f32c
Author: Volker Lendecke <[email protected]>
Date: Sat Sep 13 09:11:39 2025 +0200
smbd: Fix a few possible buffer read overruns
... only happens with invalid smb.conf settings....
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit eb2f3c29b5b1ada52a5811545ed66995bdd9afda
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 27 13:23:29 2025 +0100
smbd: Modernize DEBUGs
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 40a23349643a83d4229c8b6b0b77ff203bd76531
Author: Volker Lendecke <[email protected]>
Date: Wed Oct 22 11:07:10 2025 +0200
smbd: Fix a comment
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit cb2a145c2e2e45ced5f2f98cc239dff343c89eb0
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:46:48 2025 +0200
lib: Remove duplicate #define of TALLOC_FREE()
These days talloc.h has it.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit ffb895b51be8e5155ecf145ab1652c088fa7b0fc
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:44:56 2025 +0200
s3: Remove TALLOC_REALLOC() macro
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 38b76366888ab366c6ea13382f93b443cbee1e8e
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:39:18 2025 +0200
s3: talloc_destroy() -> TALLOC_FREE()
Sweeping change, I know. Should not change compiled code in most
cases, the compiler should be smart enough to elide the assignment
right before a return. In the cases where this is not right before the
return, TALLOC_FREE() is safer as it makes use-after-free crash.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit c7c533bdc9f916e3559d487a4a06d033728c57f4
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:28:40 2025 +0200
s3: Replace TALLOC_SIZE() with talloc_size()
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 1af249f6c7f9427593977e5a801ad41a191d648a
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:27:32 2025 +0200
vfs: Fix trailing whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit d5b66d23d80763065b7e080f1df59920cdf68254
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:26:32 2025 +0200
s3: Remove the now-unused TALLOC() macro
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 1f818eba76ba85394a6c84d998113835c622f55c
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:26:00 2025 +0200
s3: Replace a few calls to TALLOC() with talloc_size()
That does the same
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 2445d9a9b5b3a51676f092a48def8ed95c3cd6fa
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:24:02 2025 +0200
s3: Replace a few calls to TALLOC() with talloc_array()
No explicit cast necessary
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit dd8fff458e1621f5ba1a334bc7e5ff53c2fa7218
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:12:12 2025 +0200
printing: Fix trailing whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit c929fc5dfbfe78df0b72294a7d8b869eb6355e6f
Author: Volker Lendecke <[email protected]>
Date: Fri Oct 17 14:02:42 2025 +0200
smbd: Remove an obsolete comment
This does not apply anymore for a pretty long time
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 355efdc0ee41c0e318009805bef9830ba35d5008
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 27 12:26:27 2025 +0100
smbd: Make get_real_filename_full_scan_at() static
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit fda76086515f7818e38d5b40510ed4bf8d6a7120
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 27 12:25:42 2025 +0100
vfs: Simplify vfs_gpfs_get_real_filename_at()
The mangled case is handled in the caller
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 6bf3c55ca3b5d700c70a5921f3f1addf77cfd06b
Author: Volker Lendecke <[email protected]>
Date: Fri Nov 7 13:01:33 2025 +0100
smbd: Remove an unused struct member
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 84be9587a7a94debfa0854fec1a32decd8ad6857
Author: Volker Lendecke <[email protected]>
Date: Sun Nov 9 11:19:03 2025 +0100
vfs: Remove audit_file function
Added in 2012 with 0dc3f423d25d3a, but I could not find any user of
that call.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 095716c0b08696b76af3d497766a539f65cd85b6
Author: Volker Lendecke <[email protected]>
Date: Fri Nov 7 13:38:58 2025 +0100
vfs: Remove connectpath function
Nobody called this
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
commit 2553d4f637887fc1abbe7481ce82689527f8ae24
Author: Volker Lendecke <[email protected]>
Date: Fri Nov 7 13:21:23 2025 +0100
vfs: Fix smb_full_audit_parent_pathname()
Make it log the right name
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_full_audit.8.xml | 2 -
examples/VFS/shadow_copy_test.c | 18 ++---
examples/VFS/skel_opaque.c | 28 +------
examples/VFS/skel_transparent.c | 31 +-------
lib/param/param_table.c | 6 +-
lib/util/bitmap.c | 10 ++-
lib/util/bitmap.h | 6 +-
lib/util/util.c | 6 +-
lib/util/util_pw.c | 12 +--
source3/auth/auth_util.c | 5 +-
source3/include/proto.h | 4 +-
source3/include/smb.h | 4 -
source3/include/smb_macros.h | 8 --
source3/include/vfs.h | 29 +------
source3/include/vfs_macros.h | 10 ---
source3/lib/filename_util.c | 5 ++
source3/lib/sysquotas.c | 47 ++++++-----
source3/lib/sysquotas_4A.c | 32 ++++----
source3/lib/sysquotas_linux.c | 8 +-
source3/lib/sysquotas_nfs.c | 8 +-
source3/lib/sysquotas_xfs.c | 26 +++---
source3/lib/system.c | 47 -----------
source3/lib/util.c | 7 +-
source3/libads/ldap.c | 18 ++---
source3/libads/ldap_user.c | 4 +-
source3/libsmb/cliquota.c | 3 +-
source3/locking/posix.c | 16 ++--
source3/modules/vfs_afsacl.c | 4 +-
source3/modules/vfs_aixacl2.c | 18 ++---
source3/modules/vfs_ceph.c | 13 +--
source3/modules/vfs_ceph_new.c | 13 +--
source3/modules/vfs_ceph_snapshots.c | 14 +---
source3/modules/vfs_default.c | 44 ++---------
source3/modules/vfs_default_quota.c | 14 ++--
source3/modules/vfs_extd_audit.c | 10 +--
source3/modules/vfs_fileid.c | 16 ++--
source3/modules/vfs_fruit.c | 14 +---
source3/modules/vfs_full_audit.c | 47 +----------
source3/modules/vfs_glusterfs.c | 24 +-----
source3/modules/vfs_gpfs.c | 9 +--
source3/modules/vfs_nfs4acl_xattr.c | 1 +
source3/modules/vfs_not_implemented.c | 22 ------
source3/modules/vfs_recycle.c | 7 +-
source3/modules/vfs_shadow_copy.c | 24 +++---
source3/modules/vfs_shadow_copy2.c | 118 +---------------------------
source3/modules/vfs_time_audit.c | 52 ------------
source3/modules/vfs_virusfilter.c | 7 +-
source3/modules/vfs_widelinks.c | 14 +---
source3/modules/vfs_xattr_tdb.c | 7 +-
source3/passdb/pdb_ldap.c | 3 +-
source3/printing/notify.c | 4 +-
source3/printing/nt_printing.c | 6 +-
source3/printing/nt_printing_tdb.c | 4 +-
source3/printing/print_generic.c | 11 ++-
source3/printing/printspoolss.c | 7 +-
source3/registry/regfio.c | 2 +-
source3/rpc_client/cli_winreg.c | 2 +-
source3/rpc_client/cli_winreg_spoolss.c | 4 +-
source3/rpc_server/dfs/srv_dfs_nt.c | 44 ++++++-----
source3/rpc_server/fss/srv_fss_agent.c | 7 +-
source3/rpc_server/samr/srv_samr_nt.c | 15 ----
source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
source3/rpcclient/cmd_samr.c | 4 +-
source3/rpcclient/cmd_spoolss.c | 8 +-
source3/smbd/conn.c | 44 +++--------
source3/smbd/conn_idle.c | 2 +-
source3/smbd/dfree.c | 8 +-
source3/smbd/dir.c | 8 +-
source3/smbd/filename.c | 10 +--
source3/smbd/files.c | 78 ++----------------
source3/smbd/msdfs.c | 43 ++--------
source3/smbd/ntquotas.c | 11 +--
source3/smbd/open.c | 4 +-
source3/smbd/posix_acls.c | 1 +
source3/smbd/proto.h | 8 --
source3/smbd/pysmbd.c | 11 +--
source3/smbd/smb1_nttrans.c | 3 +-
source3/smbd/smb1_utils.c | 58 ++++++++++++++
source3/smbd/smb1_utils.h | 1 +
source3/smbd/smb2_pipes.c | 7 +-
source3/smbd/smb2_service.c | 9 +--
source3/smbd/vfs.c | 49 ++----------
source3/torture/pdbtest.c | 6 +-
source3/torture/torture.c | 12 +--
source3/torture/vfstest.c | 5 +-
source3/utils/net_ads.c | 2 +-
source3/utils/net_ads_gpo.c | 10 +--
source3/utils/net_groupmap.c | 2 +-
source3/utils/net_rpc.c | 60 +++++++-------
source3/utils/net_rpc_registry.c | 4 +-
source3/utils/net_rpc_shell.c | 2 +-
source3/utils/net_rpc_trust.c | 2 +-
source3/utils/net_usershare.c | 4 +-
source3/utils/net_vfs.c | 14 +---
source3/utils/sharesec.c | 2 +-
source3/winbindd/idmap_ad_nss.c | 4 +-
source3/winbindd/winbindd_cache.c | 2 +-
source3/winbindd/winbindd_cm.c | 2 +-
source3/winbindd/winbindd_cred_cache.c | 6 +-
source3/winbindd/winbindd_dual.c | 16 ++--
source3/winbindd/winbindd_util.c | 2 +-
101 files changed, 436 insertions(+), 1091 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_full_audit.8.xml
b/docs-xml/manpages/vfs_full_audit.8.xml
index a7bc95be0a8..90989fbabf4 100644
--- a/docs-xml/manpages/vfs_full_audit.8.xml
+++ b/docs-xml/manpages/vfs_full_audit.8.xml
@@ -39,14 +39,12 @@
<simplelist>
<member>aio_force</member>
- <member>audit_file</member>
<member>brl_lock_windows</member>
<member>brl_unlock_windows</member>
<member>chdir</member>
<member>close</member>
<member>closedir</member>
<member>connect</member>
- <member>connectpath</member>
<member>create_dfs_pathat</member>
<member>create_file</member>
<member>disconnect</member>
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index 157e576aaa0..d32ce0a6aff 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -1,4 +1,4 @@
-/*
+/*
* TEST implementation of an Shadow Copy module
*
* Copyright (C) Stefan Metzmacher 2003
@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -26,7 +26,7 @@
/* USE THIS MODULE ONLY FOR TESTING!!!! */
-/*
+/*
For this share
Z:\
@@ -37,7 +37,7 @@
Z:\@GMT-2003.08.05-12.02.00\
e.g.
-
+
Z:\testfile.txt
Z:\@GMT-2003.08.05-12.02.00\testfile.txt
@@ -48,7 +48,7 @@
Note: Files must differ to be displayed via Windows Explorer!
- Directories are always displayed...
+ Directories are always displayed...
*/
static int test_get_shadow_copy_data(vfs_handle_struct *handle,
@@ -58,10 +58,10 @@ static int test_get_shadow_copy_data(vfs_handle_struct
*handle,
{
uint32_t num = 3;
uint32_t i;
-
+
shadow_copy_data->num_volumes = num;
-
- if (labels) {
+
+ if (labels) {
if (num) {
shadow_copy_data->labels =
talloc_zero_array(shadow_copy_data,SHADOW_COPY_LABEL,num);
} else {
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index abb369c480a..92574b30348 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -1,4 +1,4 @@
-/*
+/*
* Skeleton VFS module. Implements dummy versions of all VFS
* functions.
*
@@ -11,12 +11,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -25,7 +25,7 @@
#include "lib/util/tevent_unix.h"
#include "lib/util/tevent_ntstatus.h"
-/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
+/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
SAMBA DEVELOPERS GUIDE!!!!!!
*/
@@ -664,15 +664,6 @@ static NTSTATUS skel_get_real_filename_at(struct
vfs_handle_struct *handle,
return NT_STATUS_NOT_IMPLEMENTED;
}
-static const char *skel_connectpath(
- struct vfs_handle_struct *handle,
- const struct files_struct *dirfsp,
- const struct smb_filename *smb_fname)
-{
- errno = ENOSYS;
- return NULL;
-}
-
static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
struct byte_range_lock *br_lck,
struct lock_struct *plock)
@@ -931,15 +922,6 @@ static bool skel_aio_force(struct vfs_handle_struct
*handle,
return false;
}
-static NTSTATUS skel_audit_file(struct vfs_handle_struct *handle,
- struct smb_filename *file,
- struct security_acl *sacl,
- uint32_t access_requested,
- uint32_t access_denied)
-{
- return NT_STATUS_NOT_IMPLEMENTED;
-}
-
static NTSTATUS skel_durable_cookie(struct vfs_handle_struct *handle,
struct files_struct *fsp,
TALLOC_CTX *mem_ctx,
@@ -1050,7 +1032,6 @@ static struct vfs_fn_pointers skel_opaque_fns = {
.fstreaminfo_fn = skel_fstreaminfo,
.get_real_filename_at_fn = skel_get_real_filename_at,
- .connectpath_fn = skel_connectpath,
.brl_lock_windows_fn = skel_brl_lock_windows,
.brl_unlock_windows_fn = skel_brl_unlock_windows,
.strict_lock_check_fn = skel_strict_lock_check,
@@ -1058,7 +1039,6 @@ static struct vfs_fn_pointers skel_opaque_fns = {
.parent_pathname_fn = skel_parent_pathname,
.fsctl_fn = skel_fsctl,
.freaddir_attr_fn = skel_freaddir_attr,
- .audit_file_fn = skel_audit_file,
/* DOS attributes. */
.get_dos_attributes_send_fn = skel_get_dos_attributes_send,
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 9a354619265..c28963fa5dd 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -1,4 +1,4 @@
-/*
+/*
* Skeleton VFS module. Implements passthrough operation of all VFS
* calls to disk functions.
*
@@ -11,12 +11,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
@@ -25,7 +25,7 @@
#include "lib/util/tevent_unix.h"
#include "lib/util/tevent_ntstatus.h"
-/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
+/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
SAMBA DEVELOPERS GUIDE!!!!!!
*/
@@ -887,14 +887,6 @@ static NTSTATUS skel_get_real_filename_at(struct
vfs_handle_struct *handle,
handle, dirfsp, name, mem_ctx, found_name);
}
-static const char *skel_connectpath(
- struct vfs_handle_struct *handle,
- const struct files_struct *dirfsp,
- const struct smb_filename *smb_fname)
-{
- return SMB_VFS_NEXT_CONNECTPATH(handle, dirfsp, smb_fname);
-}
-
static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
struct byte_range_lock *br_lck,
struct lock_struct *plock)
@@ -1227,19 +1219,6 @@ static bool skel_aio_force(struct vfs_handle_struct
*handle,
return SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
}
-static NTSTATUS skel_audit_file(struct vfs_handle_struct *handle,
- struct smb_filename *file,
- struct security_acl *sacl,
- uint32_t access_requested,
- uint32_t access_denied)
-{
- return SMB_VFS_NEXT_AUDIT_FILE(handle,
- file,
- sacl,
- access_requested,
- access_denied);
-}
-
static NTSTATUS skel_durable_cookie(struct vfs_handle_struct *handle,
struct files_struct *fsp,
TALLOC_CTX *mem_ctx,
@@ -1363,7 +1342,6 @@ static struct vfs_fn_pointers skel_transparent_fns = {
.fstreaminfo_fn = skel_fstreaminfo,
.get_real_filename_at_fn = skel_get_real_filename_at,
- .connectpath_fn = skel_connectpath,
.brl_lock_windows_fn = skel_brl_lock_windows,
.brl_unlock_windows_fn = skel_brl_unlock_windows,
.strict_lock_check_fn = skel_strict_lock_check,
@@ -1371,7 +1349,6 @@ static struct vfs_fn_pointers skel_transparent_fns = {
.parent_pathname_fn = skel_parent_pathname,
.fsctl_fn = skel_fsctl,
.freaddir_attr_fn = skel_freaddir_attr,
- .audit_file_fn = skel_audit_file,
/* DOS attributes. */
.get_dos_attributes_send_fn = skel_get_dos_attributes_send,
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 04d4d1dac84..d23046b6365 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -368,7 +368,8 @@ static const struct enum_list enum_ldap_deref[] = {
{SAMBA_LDAP_DEREF_SEARCHING, "searching"},
{SAMBA_LDAP_DEREF_FINDING, "finding"},
{SAMBA_LDAP_DEREF_ALWAYS, "always"},
- {-1, "auto"}
+ {-1, "auto"},
+ {-1, NULL},
};
static const struct enum_list enum_ldap_passwd_sync[] = {
@@ -434,6 +435,7 @@ static const struct enum_list enum_nt_hash_store[] = {
{NT_HASH_STORE_AUTO, "auto"},
{NT_HASH_STORE_NEVER, "never"},
{NT_HASH_STORE_ALWAYS, "always"},
+ {-1, NULL},
};
@@ -492,5 +494,5 @@ static const struct enum_list
enum_client_netlogon_ping_protocol[] = {
int num_parameters(void)
{
- return (sizeof(parm_table) / sizeof(struct parm_struct));
+ return ARRAY_SIZE(parm_table);
}
diff --git a/lib/util/bitmap.c b/lib/util/bitmap.c
index 12cdfe4d16a..83e0b2ca25a 100644
--- a/lib/util/bitmap.c
+++ b/lib/util/bitmap.c
@@ -34,10 +34,14 @@ struct bitmap {
/****************************************************************************
talloc a bitmap
****************************************************************************/
-struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
+struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, unsigned n)
{
struct bitmap *bm;
+ if (n > (UINT_MAX - 32)) {
+ return NULL;
+ }
+
bm = (struct bitmap *)talloc_zero_size(
mem_ctx,
offsetof(struct bitmap, b) + sizeof(uint32_t)*((n+31)/32));
@@ -95,7 +99,7 @@ bool bitmap_clear(struct bitmap *bm, unsigned i)
/****************************************************************************
query a bit in a bitmap
****************************************************************************/
-bool bitmap_query(struct bitmap *bm, unsigned i)
+bool bitmap_query(const struct bitmap * const bm, unsigned i)
{
if (i >= bm->n) return false;
if (bm->b[i/32] & (1U<<(i%32))) {
@@ -108,7 +112,7 @@ bool bitmap_query(struct bitmap *bm, unsigned i)
find a zero bit in a bitmap starting at the specified offset, with
wraparound
****************************************************************************/
-int bitmap_find(struct bitmap *bm, unsigned ofs)
+int bitmap_find(const struct bitmap * const bm, unsigned ofs)
{
unsigned int i, j;
diff --git a/lib/util/bitmap.h b/lib/util/bitmap.h
index 6d75929fb5a..664284cd8a8 100644
--- a/lib/util/bitmap.h
+++ b/lib/util/bitmap.h
@@ -21,9 +21,9 @@
struct bitmap;
-struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n);
+struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, unsigned n);
int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src);
bool bitmap_set(struct bitmap *bm, unsigned i);
bool bitmap_clear(struct bitmap *bm, unsigned i);
-bool bitmap_query(struct bitmap *bm, unsigned i);
-int bitmap_find(struct bitmap *bm, unsigned ofs);
+bool bitmap_query(const struct bitmap * const bm, unsigned i);
+int bitmap_find(const struct bitmap * const bm, unsigned ofs);
diff --git a/lib/util/util.c b/lib/util/util.c
index 139b75b616a..bd610fa7045 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -552,8 +552,7 @@ void dump_data_cb(const uint8_t *buf, int len,
size_t this_len = MIN(remaining_len, 16);
const uint8_t *this_buf = &buf[i];
- if ((omit_zero_bytes == true) &&
- (i > 0) && (remaining_len > 16) &&
+ if (omit_zero_bytes && (i > 0) && (remaining_len > 16) &&
(this_len == 16) && all_zero(this_buf, 16))
{
if (!skipped) {
@@ -658,8 +657,7 @@ void dump_data_diff_cb(const uint8_t *buf1, size_t len1,
this_buf2 = &buf2[i];
}
- if ((omit_zero_bytes == true) &&
- (i > 0) && (remaining_len > 16) &&
+ if (omit_zero_bytes && (i > 0) && (remaining_len > 16) &&
(this_len1 == 16) && all_zero(this_buf1, 16) &&
(this_len2 == 16) && all_zero(this_buf2, 16))
{
diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c
index 8035de4392c..398932a9ec5 100644
--- a/lib/util/util_pw.c
+++ b/lib/util/util_pw.c
@@ -1,4 +1,4 @@
-/*
+/*
Unix SMB/CIFS implementation.
Safe versions of getpw* calls
@@ -9,17 +9,17 @@
Copyright (C) Timur Bakeyev 2005
Copyright (C) Bjoern Jacke 2006-2007
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -63,7 +63,7 @@ struct passwd *getpwnam_alloc(TALLOC_CTX *mem_ctx, const char
*name)
struct passwd *temp;
temp = getpwnam(name);
-
+
if (!temp) {
#if 0
if (errno == ENOMEM) {
@@ -85,7 +85,7 @@ struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)
struct passwd *temp;
temp = getpwuid(uid);
-
+
if (!temp) {
#if 0
if (errno == ENOMEM) {
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index b7a81f09c9e..4ee158e0255 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -1883,13 +1883,10 @@ static NTSTATUS check_account(TALLOC_CTX *mem_ctx,
const char *domain,
char *real_username = NULL;
struct passwd *passwd;
- lower_username = talloc_strdup(mem_ctx, username);
+ lower_username = strlower_talloc(mem_ctx, username);
if (!lower_username) {
return NT_STATUS_NO_MEMORY;
}
- if (!strlower_m( lower_username )) {
- return NT_STATUS_INVALID_PARAMETER;
- }
orig_dom_user = talloc_asprintf(mem_ctx,
"%s%c%s",
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9f4ab67ea64..8f4f500ded5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -204,9 +204,6 @@ int sys_setgroups(gid_t UNUSED(primary_gid), int setlen,
gid_t *gidset);
uint32_t unix_dev_major(SMB_DEV_T dev);
uint32_t unix_dev_minor(SMB_DEV_T dev);
char *sys_realpath(const char *path);
-#if 0
-int sys_get_number_of_cores(void);
-#endif
struct sys_proc_fd_path_buf {
char buf[35]; /* "/proc/self/fd/" + strlen(2^64) + 0-terminator */
@@ -713,6 +710,7 @@ struct smb_filename *cp_smb_filename(TALLOC_CTX *mem_ctx,
const struct smb_filename *in);
struct smb_filename *cp_smb_filename_nostream(TALLOC_CTX *mem_ctx,
const struct smb_filename *in);
+struct smb_filename *cp_smb_basename(TALLOC_CTX *mem_ctx, const char *fname);
bool is_ntfs_stream_smb_fname(const struct smb_filename *smb_fname);
bool is_ntfs_default_stream_smb_fname(const struct smb_filename *smb_fname);
bool is_named_stream(const struct smb_filename *smb_fname);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 61c5963a02c..bd7abd7f364 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -408,10 +408,6 @@ struct interface {
otherwise NT will not honour the announce packets */
#define MAX_SERVER_STRING_LENGTH 48
-#ifdef NOSTRDUP
-char *strdup(char *s);
-#endif
-
#ifndef SELECT_CAST
#define SELECT_CAST
#endif
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 3192cbe11d8..0d7ed45b770 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -211,14 +211,6 @@ copy an IP address from one buffer to another
#define SMB_XMALLOC_P(type) (type *)smb_xmalloc_array(sizeof(type),1)
#define SMB_XMALLOC_ARRAY(type,count) (type
*)smb_xmalloc_array(sizeof(type),(count))
-#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
-#define TALLOC_SIZE(ctx, size) talloc_named_const(ctx, size, __location__)
-#define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count,
__location__)
-#define talloc_destroy(ctx) talloc_free(ctx)
-#ifndef TALLOC_FREE
-#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
-#endif
-
/* only define PARANOID_MALLOC_CHECKER with --enable-developer */
#if defined(DEVELOPER)
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index cf6590a56cd..e99d84e36f8 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -394,6 +394,8 @@
* Version 51 - Add ntcreatex_deny_[dos|fcb] and ntcreatex_stream_baseopen
* Change to Version 52 - will ship with 4.24
* Version 52 - Add rename_stream
+ * Version 52 - Remove connectpath
+ * Version 52 - Remove audit_file
*/
#define SMB_VFS_INTERFACE_VERSION 51
@@ -1221,10 +1223,6 @@ struct vfs_fn_pointers {
TALLOC_CTX *mem_ctx,
char **found_name);
--
Samba Shared Repository
