The branch, master has been updated
via f2935d37d5f libsmbclient: Intercept "smb311_posix.statinfo"
attribute
via 043a67551cc libsmbclient: Intercept "posix.attr.enabled" for
fgetxattr
via 8a62739539a libsmbclient: Request posix file handles on demand
via 40d7c38abfc libsmbclient: Allow O_PATH for smbc_open()
via 7c6d16ee221 libsmbclient: Add fgetxattr
via 9d0ab4b8065 libsmb: Remove "source3/libsmb/libsmb.h"
from 504866860df smbd: Modernize DBGs
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f2935d37d5fc54e3578b4fdfbe741a94381a4514
Author: Volker Lendecke <[email protected]>
Date: Tue Jun 10 19:10:42 2025 +0200
libsmbclient: Intercept "smb311_posix.statinfo" attribute
Directly get a "struct stat" plus a 32-bit uint32 for the dosatts
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Ralph Böhme <[email protected]>
Autobuild-Date(master): Mon Jun 16 16:08:20 UTC 2025 on atb-devel-224
commit 043a67551ccfd87cef3c7e75dd40f459734f638b
Author: Volker Lendecke <[email protected]>
Date: Mon Jun 2 15:24:04 2025 +0200
libsmbclient: Intercept "posix.attr.enabled" for fgetxattr
Local call to find out whether the file was opened with smb311 posix
extensions.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
commit 8a62739539a2f2b899788271e4a3074e738206f6
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 4 08:19:56 2025 +0200
libsmbclient: Request posix file handles on demand
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
commit 40d7c38abfc12c4836c828987a40f9345964f0f8
Author: Volker Lendecke <[email protected]>
Date: Tue Apr 29 14:04:26 2025 +0200
libsmbclient: Allow O_PATH for smbc_open()
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
commit 7c6d16ee221ad3662bbab41d1714832ed9fff896
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 11 12:28:09 2025 +0200
libsmbclient: Add fgetxattr
Just boilerplate so far
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
commit 9d0ab4b80651ccde8e98ed8917c0ec7c59dc7628
Author: Volker Lendecke <[email protected]>
Date: Tue May 13 16:25:07 2025 +0200
libsmb: Remove "source3/libsmb/libsmb.h"
libsmb.h added ads_status.h and cli_smb2_fnum.h. Only few users need
either.
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/fuzzing/fuzz_nmblib_parse_packet.c | 2 +-
libgpo/gpo_fetch.c | 1 -
libgpo/gpo_filesync.c | 3 +-
source3/client/client.c | 3 +-
source3/client/clitar.c | 3 +-
source3/client/smbspool.c | 3 +-
source3/include/libsmb_internal.h | 8 ++
source3/include/libsmbclient.h | 8 ++
source3/lib/netapi/cm.c | 3 +-
source3/lib/util_sd.c | 3 +-
source3/libads/trusts_util.c | 1 -
source3/libnet/libnet_join.c | 4 +-
.../{smbclient-0.8.0.sigs => smbclient-0.8.1.sigs} | 2 +
source3/libsmb/async_smb.c | 2 +-
source3/libsmb/cliconnect.c | 4 +-
source3/libsmb/clidfs.c | 3 +-
source3/libsmb/clidgram.c | 1 -
source3/libsmb/clientgen.c | 3 +-
source3/libsmb/clierror.c | 3 +-
source3/libsmb/clifile.c | 4 +-
source3/libsmb/clifsinfo.c | 4 +-
source3/libsmb/clilist.c | 4 +-
source3/libsmb/climessage.c | 3 +-
source3/libsmb/clioplock.c | 3 +-
source3/libsmb/cliprint.c | 3 +-
source3/libsmb/cliquota.c | 4 +-
source3/libsmb/clirap.c | 3 +-
source3/libsmb/clireadwrite.c | 4 +-
source3/libsmb/clisecdesc.c | 4 +-
source3/libsmb/clisymlink.c | 3 +-
source3/libsmb/clitrans.c | 3 +-
source3/libsmb/libsmb.h | 31 -----
source3/libsmb/libsmb_cache.c | 2 +-
source3/libsmb/libsmb_context.c | 4 +-
source3/libsmb/libsmb_dir.c | 3 +-
source3/libsmb/libsmb_file.c | 57 ++++++++-
source3/libsmb/libsmb_misc.c | 1 -
source3/libsmb/libsmb_printjob.c | 2 +-
source3/libsmb/libsmb_server.c | 3 +-
source3/libsmb/libsmb_setget.c | 12 ++
source3/libsmb/libsmb_stat.c | 3 +-
source3/libsmb/libsmb_xattr.c | 129 ++++++++++++++++++++-
source3/libsmb/passchange.c | 3 +-
source3/libsmb/pylibsmb.c | 4 +-
source3/libsmb/wscript | 2 +-
source3/nmbd/nmbd_packets.c | 1 -
source3/nmbd/nmbd_synclists.c | 3 +-
source3/rpc_client/cli_netlogon.c | 1 -
source3/rpc_client/cli_pipe.c | 3 +-
source3/rpc_client/cli_pipe_schannel.c | 1 -
source3/rpc_server/spoolss/srv_spoolss_nt.c | 3 +-
source3/rpcclient/cmd_iremotewinspool.c | 1 -
source3/rpcclient/cmd_spoolss.c | 3 +-
source3/rpcclient/cmd_spotlight.c | 1 -
source3/rpcclient/rpcclient.c | 3 +-
source3/smbd/ntquotas.c | 3 +-
source3/smbd/seal.c | 1 -
source3/smbd/smb1_nttrans.c | 1 -
source3/smbd/smb2_nttrans.c | 2 +-
source3/torture/denytest.c | 1 -
source3/torture/locktest2.c | 3 +-
source3/torture/mangle_test.c | 1 -
source3/torture/nbench.c | 1 -
source3/torture/nbio.c | 1 -
source3/torture/proto.h | 3 +-
source3/torture/scanner.c | 1 -
source3/torture/test_async_echo.c | 1 -
source3/torture/test_buffersize.c | 1 -
source3/torture/test_case_insensitive.c | 1 -
source3/torture/test_chain3.c | 1 -
source3/torture/test_cleanup.c | 1 -
source3/torture/test_hidenewfiles.c | 1 -
source3/torture/test_notify.c | 1 -
source3/torture/test_notify_online.c | 1 -
source3/torture/test_nttrans_create.c | 1 -
source3/torture/test_nttrans_fsctl.c | 1 -
source3/torture/test_oplock_cancel.c | 1 -
source3/torture/test_posix.c | 1 -
source3/torture/test_posix_append.c | 1 -
source3/torture/test_readdir_timestamp.c | 1 -
source3/torture/test_rpc_scale.c | 1 -
source3/torture/torture.c | 3 +-
source3/torture/utable.c | 1 -
source3/utils/clirap2.c | 3 +-
source3/utils/net_ads.c | 3 +-
source3/utils/net_dom.c | 3 +-
source3/utils/net_rap.c | 3 +-
source3/utils/net_rpc.c | 3 +-
source3/utils/net_rpc_printer.c | 3 +-
source3/utils/net_rpc_shell.c | 3 +-
source3/utils/net_rpc_trust.c | 3 +-
source3/utils/net_time.c | 3 +-
source3/utils/net_util.c | 3 +-
source3/utils/netlookup.c | 3 +-
source3/utils/smbcacls.c | 3 +-
source3/utils/smbcquotas.c | 3 +-
source3/utils/smbtree.c | 1 -
source3/winbindd/winbindd_cm.c | 3 +-
98 files changed, 332 insertions(+), 126 deletions(-)
copy source3/libsmb/ABI/{smbclient-0.8.0.sigs => smbclient-0.8.1.sigs} (98%)
delete mode 100644 source3/libsmb/libsmb.h
Changeset truncated at 500 lines:
diff --git a/lib/fuzzing/fuzz_nmblib_parse_packet.c
b/lib/fuzzing/fuzz_nmblib_parse_packet.c
index c8a2d035ef7..7c0de12b9f4 100644
--- a/lib/fuzzing/fuzz_nmblib_parse_packet.c
+++ b/lib/fuzzing/fuzz_nmblib_parse_packet.c
@@ -17,7 +17,7 @@
*/
#include "../../source3/include/includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/proto.h"
#include "libsmb/nmblib.h"
#include "fuzzing/fuzzing.h"
diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 31d510db2a2..2449ae4bcb6 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -23,7 +23,6 @@
#include "../libgpo/gpo_ini.h"
#include "libgpo/gpo_proto.h"
-#include "libsmb/libsmb.h"
/****************************************************************
explode the GPO CIFS URI into their components
diff --git a/libgpo/gpo_filesync.c b/libgpo/gpo_filesync.c
index b0d1447bd85..07234dc37a4 100644
--- a/libgpo/gpo_filesync.c
+++ b/libgpo/gpo_filesync.c
@@ -19,7 +19,8 @@
#include "includes.h"
#include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#include "lib/util/string_wrappers.h"
diff --git a/source3/client/client.c b/source3/client/client.c
index e448ded6b6e..7857f7e56f5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -32,7 +32,8 @@
#include "../libcli/smbreadline/smbreadline.h"
#include "../libcli/security/security.h"
#include "system/select.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "libsmb/smbsock_connect.h"
#include "libsmb/clirap.h"
#include "trans2.h"
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 2a1efdaf37b..28745d7da44 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -70,7 +70,8 @@
#include "system/filesys.h"
#include "client/client_proto.h"
#include "client/clitar_proto.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "lib/util/util_file.h"
#ifdef HAVE_LIBARCHIVE
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 56661b98336..c056cc76996 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -26,7 +26,8 @@
#include "system/filesys.h"
#include "system/passwd.h"
#include "system/kerberos.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "libsmb/smbsock_connect.h"
#include "lib/param/param.h"
#include "lib/krb5_wrap/krb5_samba.h"
diff --git a/source3/include/libsmb_internal.h
b/source3/include/libsmb_internal.h
index df238886036..bacd5a5cc62 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -239,6 +239,7 @@ struct SMBC_internal_data {
smbc_removexattr_fn removexattr_fn;
smbc_listxattr_fn listxattr_fn;
#endif
+ smbc_fgetxattr_fn fgetxattr_fn;
} posix_emu;
#if 0 /* Left in libsmbclient.h for backward compatibility */
@@ -570,6 +571,13 @@ SMBC_getxattr_ctx(SMBCCTX *context,
const void *value,
size_t size);
+int
+SMBC_fgetxattr_ctx(SMBCCTX *context,
+ SMBCFILE *file,
+ const char *name,
+ const void *value,
+ size_t size);
+
int
SMBC_removexattr_ctx(SMBCCTX *context,
const char *fname,
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 85fa5d1b7b7..948eba3361a 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -1156,6 +1156,14 @@ typedef int (*smbc_getxattr_fn)(SMBCCTX *context,
smbc_getxattr_fn smbc_getFunctionGetxattr(SMBCCTX *c);
void smbc_setFunctionGetxattr(SMBCCTX *c, smbc_getxattr_fn fn);
+typedef int (*smbc_fgetxattr_fn)(SMBCCTX *context,
+ SMBCFILE *file,
+ const char *name,
+ const void *value,
+ size_t size);
+smbc_fgetxattr_fn smbc_getFunctionFGetxattr(SMBCCTX *c);
+void smbc_setFunctionFGetxattr(SMBCCTX *c, smbc_fgetxattr_fn fn);
+
typedef int (*smbc_removexattr_fn)(SMBCCTX *context,
const char *fname,
const char *name);
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index c7a3a0873d6..db3e2d23891 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -21,7 +21,8 @@
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "rpc_client/cli_pipe.h"
#include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/lib/util_sd.c b/source3/lib/util_sd.c
index 23f37b7e734..86e375cb0dd 100644
--- a/source3/lib/util_sd.c
+++ b/source3/lib/util_sd.c
@@ -22,7 +22,8 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "util_sd.h"
#include "librpc/gen_ndr/ndr_lsa.h"
#include "../libcli/security/security.h"
diff --git a/source3/libads/trusts_util.c b/source3/libads/trusts_util.c
index 6a39f32f350..9bea87990b6 100644
--- a/source3/libads/trusts_util.c
+++ b/source3/libads/trusts_util.c
@@ -29,7 +29,6 @@
#include "secrets.h"
#include "ads.h"
#include "passdb.h"
-#include "libsmb/libsmb.h"
#include "source3/include/messages.h"
#include "source3/include/g_lock.h"
#include "lib/util/util_tdb.h"
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 439bd2c01a9..c33724494aa 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -19,6 +19,8 @@
*/
#include "includes.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "ads.h"
#include "libsmb/namequery.h"
#include "librpc/gen_ndr/ndr_libnet_join.h"
@@ -35,10 +37,10 @@
#include "../libds/common/flags.h"
#include "secrets.h"
#include "rpc_client/init_lsa.h"
+
#include "rpc_client/cli_pipe.h"
#include "../libcli/security/security.h"
#include "passdb.h"
-#include "libsmb/libsmb.h"
#include "../libcli/smb/smbXcli_base.h"
#include "lib/param/loadparm.h"
#include "libcli/auth/netlogon_creds_cli.h"
diff --git a/source3/libsmb/ABI/smbclient-0.8.0.sigs
b/source3/libsmb/ABI/smbclient-0.8.1.sigs
similarity index 98%
copy from source3/libsmb/ABI/smbclient-0.8.0.sigs
copy to source3/libsmb/ABI/smbclient-0.8.1.sigs
index fc7e79fec17..608acd503d3 100644
--- a/source3/libsmb/ABI/smbclient-0.8.0.sigs
+++ b/source3/libsmb/ABI/smbclient-0.8.1.sigs
@@ -19,6 +19,7 @@ smbc_getFunctionChmod: smbc_chmod_fn (SMBCCTX *)
smbc_getFunctionClose: smbc_close_fn (SMBCCTX *)
smbc_getFunctionClosedir: smbc_closedir_fn (SMBCCTX *)
smbc_getFunctionCreat: smbc_creat_fn (SMBCCTX *)
+smbc_getFunctionFGetxattr: smbc_fgetxattr_fn (SMBCCTX *)
smbc_getFunctionFstat: smbc_fstat_fn (SMBCCTX *)
smbc_getFunctionFstatVFS: smbc_fstatvfs_fn (SMBCCTX *)
smbc_getFunctionFstatdir: smbc_fstatdir_fn (SMBCCTX *)
@@ -114,6 +115,7 @@ smbc_setFunctionChmod: void (SMBCCTX *, smbc_chmod_fn)
smbc_setFunctionClose: void (SMBCCTX *, smbc_close_fn)
smbc_setFunctionClosedir: void (SMBCCTX *, smbc_closedir_fn)
smbc_setFunctionCreat: void (SMBCCTX *, smbc_creat_fn)
+smbc_setFunctionFGetxattr: void (SMBCCTX *, smbc_fgetxattr_fn)
smbc_setFunctionFstat: void (SMBCCTX *, smbc_fstat_fn)
smbc_setFunctionFstatVFS: void (SMBCCTX *, smbc_fstatvfs_fn)
smbc_setFunctionFstatdir: void (SMBCCTX *, smbc_fstatdir_fn)
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 3e626d1cc8c..8c8003c5641 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index d83a820f9e1..9dfdb8aefae 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -21,7 +21,9 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "libads/ads_status.h"
#include "libsmb/namequery.h"
#include "../libcli/auth/libcli_auth.h"
#include "auth/credentials/credentials.h"
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index cafb1b421a6..cb0d8a88ecc 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -20,7 +20,8 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "libsmb/clirap.h"
#include "msdfs.h"
#include "trans2.h"
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index c87c870345f..719da9d5c50 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -20,7 +20,6 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
#include "../lib/util/tevent_ntstatus.h"
#include "libsmb/clidgram.h"
#include "libsmb/nmblib.h"
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index d699f035847..f9d756fcd5f 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -19,7 +19,8 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../lib/util/tevent_ntstatus.h"
#include "../libcli/smb/smb_signing.h"
#include "../libcli/smb/smb_seal.h"
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 3a024ea22e3..d443cf7255b 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -20,7 +20,8 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../libcli/smb/smbXcli_base.h"
int cli_status_to_errno(NTSTATUS status)
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index c079f84049e..981829c0e37 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -20,7 +20,9 @@
#include "includes.h"
#include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "libsmb/clirap.h"
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 4b82a0bd1e9..ded07f21a9a 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -20,7 +20,9 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "trans2.h"
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index d8951482bac..f954405ba10 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -18,7 +18,9 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "trans2.h"
diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index 856361589f5..2f6a1848955 100644
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -20,7 +20,8 @@
#include "includes.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../libcli/smb/smbXcli_base.h"
struct cli_message_start_state {
diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index aee09da41ec..0ff91045201 100644
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -20,7 +20,8 @@
#include "includes.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../libcli/smb/smbXcli_base.h"
struct cli_smb_oplock_break_waiter_state {
diff --git a/source3/libsmb/cliprint.c b/source3/libsmb/cliprint.c
index 3808811cccd..728b7da2904 100644
--- a/source3/libsmb/cliprint.c
+++ b/source3/libsmb/cliprint.c
@@ -18,7 +18,8 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "libsmb/clirap.h"
#include "../libcli/smb/smbXcli_base.h"
#include "lib/util/string_wrappers.h"
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 0c41272f21a..865a41ff618 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -18,7 +18,9 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "fake_file.h"
#include "../libcli/security/security.h"
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index 758d6ccbb1e..99762443cb5 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -24,7 +24,8 @@
#include "../librpc/gen_ndr/rap.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "libsmb/clirap.h"
#include "trans2.h"
#include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 0dfcd479cc0..a7bef4497e5 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -18,7 +18,9 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "trans2.h"
diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c
index 853e46a0f0a..32558c148c9 100644
--- a/source3/libsmb/clisecdesc.c
+++ b/source3/libsmb/clisecdesc.c
@@ -18,7 +18,9 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
+#include "source3/libsmb/cli_smb2_fnum.h"
#include "../libcli/security/secdesc.h"
#include "../libcli/smb/smbXcli_base.h"
#include "lib/util/tevent_ntstatus.h"
diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c
index d7ecf545761..c8632cde848 100644
--- a/source3/libsmb/clisymlink.c
+++ b/source3/libsmb/clisymlink.c
@@ -19,7 +19,8 @@
#include "includes.h"
#include "system/filesys.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "libsmb/clirap.h"
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 2cd75d2a800..5a53f762200 100644
--- a/source3/libsmb/clitrans.c
+++ b/source3/libsmb/clitrans.c
@@ -18,7 +18,8 @@
*/
#include "includes.h"
-#include "libsmb/libsmb.h"
+#include "source3/include/client.h"
+#include "source3/libsmb/proto.h"
#include "../lib/util/tevent_ntstatus.h"
#include "async_smb.h"
#include "../libcli/smb/smbXcli_base.h"
diff --git a/source3/libsmb/libsmb.h b/source3/libsmb/libsmb.h
deleted file mode 100644
index 6df06aef4d8..00000000000
--- a/source3/libsmb/libsmb.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- Copyright (C) Andrew Tridgell 1992-1998,2001
- Copyright (C) Jeremy Allison 1998
- Copyright (C) Remus Koos 2001
- Copyright (C) Andrew Bartlett 2001
-
- 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/>.
-*/
-
-#ifndef _LIBSMB_LIBSMB_H
-#define _LIBSMB_LIBSMB_H
--
Samba Shared Repository
