[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Wed Jun 6 04:08:05 MDT 2012
The branch, master has been updated
via 02d9ba6 s3:smbd: change user_struct->vuid to uint64_t
via bb27bb0 s3:smbd: let file_close_pid/file_close_user take a uint64_t vuid
via 7d77206 s3:smbd: pass down vuid as uint64_t in lanman.c
via 612838d s3:smbd: pass down vuid as uint64_t in ipc.c
via d3e79a8 s3:smbd: change vuid to uint64_t in uid.c
via c535668 s3:smbd: let fcb_or_dos_open() take a uint64_t vuid
via 9ffb8f1 s3:smbd: let close_cnum() take a uint64_t vuid
via 69d1f9b s3:smbd: use UID_FIELD_INVALID (0) instead of (uint16)-1 when calling close_cnum()
via 2a9a95e s3:smbd: let make_connection() take a uint64_t vuid
via 19d0517 s3:smbd: let conn_clear_vuid_caches() take a uint64_t vuid
via 2477c73 s3:smbd: let open_fake_file() take a uint64_t vuid
via 484cb4e s3:printing: let print_spool_open() take a uint64_t vuid
via 53cd38e s3:smbd: change conn_ctx->vuid to uint64_t
via c0e5cc0 s3:include: change current_user->vuid to uint64_t
via 21e6db8 s3:smbd: change trans_state->vuid to uint64_t
via d4aa494 s3:include: change smb_request->vuid to uint64_t
via d45e0dd s3:include: move struct smb_request to vfs.h
via 37bfadf s3:include: change files_struct->vuid to uint64_t
via 5a260a1 s3:include: change connection_struct->vuid to uint64_t
via defebd9 s3:includes: change vuid_cache_entry->vuid to uint64_t
via 36c7016 s3:include: move sys_acl prototypes to smb_acls.h
via bc39915 s3:smbd: move struct user_struct to globals.h
via b742a75 s3:include: remove typedef user_struct
via f52e573 s3:smbd: use 'struct user_struct' instead of typedef'ed 'user_struct'
via 9e2e370 s3:smbd: move forward declaration of struct aio_extra to smbd.h
via b6319b5 s3:printing: use smbd/smbd.h instead of just smbd/proto.h in queue_process.c
via f454765 s3:torture: use smbd/smbd.h instead of just smbd/proto.h in vfstest_chain.c
via af4c99e s3:utils: use smbd/smbd.h instead of just smbd/proto.h
via 7bc328d s3:modules: we don't need smbd/proto.h in vfs_shadow_copy2.c
via 16be476 s3:lib: we don't need smbd/proto.h in smbd_shim.c
via 04ab606 examples/VFS: don't use smbd/proto.h
via 9b5c2ca s3:include: move some prototypes (e.g. smb_register_vfs) to vfs.h
via c44d2e9 s3:include: remove unused forward declaration of deferred_open_record in smb.h
via 5306c18 s3:smbd: move UCF_ defines to smbd.h
via 4a22dd6 s3:include: move struct smb_filename to vfs.h
via 22cfc8e s3:include: move struct smb_file_time to vfs.h
via 5fc502c s3:include: move struct connection_struct (and sub structs) to vfs.h
via f88d13b s3:include: move struct stream_struct to vfs.h
via b9500bd s3:include: move struct fd_handle/files_struct to vfs.h
via f78cc3a s3:includes: move union unid_t to vfs.h
via 44482ad s3:smbd: move struct trans_state to smbd.h
via ce41497 s3:smbd: move struct privilege_paths to smbd.h
via 659f3e6 s3:smbd: make struct notify_change_buf private to notify.c
via b5b943d s3:smbd: make use of change_notify_fsp_has_changes()
via dc962c1 s3:smbd: add change_notify_fsp_has_changes()
via d1d7904 s3:printing: add print_spool_rap_jobid()
via 6d2d8f5 s3:printing: make struct print_file_data private to printspoolss.c
via e91c223 s3:smbd: use print_spool_rap_jobid() in call_trans2ioctl()
via c2ffe33 s3:smbd: use print_spool_rap_jobid() in reply_ioctl()
via 145fe2a s3:smbd: fcb_or_dos_open() can be static
via 0907b1e s3:smbd: dup_file_fsp() never gets called for print files
via cf549ff s3:smbd: make struct vfs_fsp_data private to vfs.c
via 4321e19 s3:smbd: make use of vfs_remove_all_fsp_extensions() in file_free()
via cd3e658 s3:smbd: add vfs_remove_all_fsp_extensions()
via a8e7c57 s3:includes: move struct share_mode_lock to locking.h
via 05dc497 s3:smbd: remove typedef for struct write_cache
via 4a91321 s3:smbd: make typedef write_cache private to fileio.c
from 01b726d s3-libsmb: Fix error messages to correctly mention PLAINTEXT not LM
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 02d9ba6ee1db9d65fad5d8bcd7478abd82281d5d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 18:17:15 2012 +0200
s3:smbd: change user_struct->vuid to uint64_t
Only sconn->smb1.sessions.next_vuid remains as uint16_t,
so that we do not generate larger values yet.
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Wed Jun 6 12:07:33 CEST 2012 on sn-devel-104
commit bb27bb081e79334861192b6e02c51fd70440c65e
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 18:23:14 2012 +0200
s3:smbd: let file_close_pid/file_close_user take a uint64_t vuid
metze
commit 7d772064b42c93593d8a4f21489f672730858359
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 16:34:27 2012 +0200
s3:smbd: pass down vuid as uint64_t in lanman.c
metze
commit 612838dca8a6bba411167659ac3107a8634f0504
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 16:27:09 2012 +0200
s3:smbd: pass down vuid as uint64_t in ipc.c
metze
commit d3e79a864d0eaf962ed00794e7424441e80294c1
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 16:19:01 2012 +0200
s3:smbd: change vuid to uint64_t in uid.c
metze
commit c535668f7b203be96f002d88840338486a80f802
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 16:09:53 2012 +0200
s3:smbd: let fcb_or_dos_open() take a uint64_t vuid
metze
commit 9ffb8f153287bb95e5189282c6f6b40ddf52ef61
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 16:07:13 2012 +0200
s3:smbd: let close_cnum() take a uint64_t vuid
metze
commit 69d1f9b83684172ddb8639dbf64ce7cb2743e450
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 16:01:56 2012 +0200
s3:smbd: use UID_FIELD_INVALID (0) instead of (uint16)-1 when calling close_cnum()
The only thing that's important is that the value is invalid.
metze
commit 2a9a95e673f23ed31ca186c2701b0ec816e370c7
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:56:46 2012 +0200
s3:smbd: let make_connection() take a uint64_t vuid
metze
commit 19d05171fa689e160fa790eceaa2ed35bb976c9a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:50:21 2012 +0200
s3:smbd: let conn_clear_vuid_caches() take a uint64_t vuid
metze
commit 2477c73b62437fd8d5e1a8b9ee848736d4843044
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:39:44 2012 +0200
s3:smbd: let open_fake_file() take a uint64_t vuid
metze
commit 484cb4e43e2f9fa89ceb27bf89e3cade53650fdf
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:35:11 2012 +0200
s3:printing: let print_spool_open() take a uint64_t vuid
metze
commit 53cd38ebb8974bee4f3ed16f9fa4d03b85ea55a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:27:38 2012 +0200
s3:smbd: change conn_ctx->vuid to uint64_t
metze
commit c0e5cc0686c8b02b4585299fce0c0511da827d42
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:21:52 2012 +0200
s3:include: change current_user->vuid to uint64_t
metze
commit 21e6db8f7e470958cfaf8ee227329d06131a98e0
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 15:14:04 2012 +0200
s3:smbd: change trans_state->vuid to uint64_t
metze
commit d4aa494654a3fb2ff6dbfe7133b8f4023c4f192b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 14:40:57 2012 +0200
s3:include: change smb_request->vuid to uint64_t
metze
commit d45e0ddfcdfc005717b1596342af5ab133c19177
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 13:39:49 2012 +0200
s3:include: move struct smb_request to vfs.h
metze
commit 37bfadf4a389369632e86e3446f37f54a436848f
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 13:17:26 2012 +0200
s3:include: change files_struct->vuid to uint64_t
metze
commit 5a260a1d58a56054762fee17ca66e0f87a5aac85
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 13:05:43 2012 +0200
s3:include: change connection_struct->vuid to uint64_t
metze
commit defebd9e492b19fc91cfd1a07fa5554e1a636482
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 14:37:45 2012 +0200
s3:includes: change vuid_cache_entry->vuid to uint64_t
metze
commit 36c7016cc06d8e8e45ffc4212ae4ed1f5706c6b0
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 12:33:52 2012 +0200
s3:include: move sys_acl prototypes to smb_acls.h
metze
commit bc39915f47bb5555cdc10ebb9cc843ed16e3b207
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 12:07:43 2012 +0200
s3:smbd: move struct user_struct to globals.h
metze
commit b742a75b379a755c3ee75c389f41f80c3014e36e
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 12:06:11 2012 +0200
s3:include: remove typedef user_struct
metze
commit f52e5738a26e12787ec8a4c8d73ff14122d202c6
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 12:04:15 2012 +0200
s3:smbd: use 'struct user_struct' instead of typedef'ed 'user_struct'
metze
commit 9e2e3708aa4e10aef561b1a9cc1f89688d65445f
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:54:40 2012 +0200
s3:smbd: move forward declaration of struct aio_extra to smbd.h
metze
commit b6319b54573d6c6b340395c60b601b5c2fca7b3a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 14:53:01 2012 +0200
s3:printing: use smbd/smbd.h instead of just smbd/proto.h in queue_process.c
This fixes compiler warnings regarding incomplete types.
metze
commit f454765b37feb449d6a7b9ecf1133afcaac474b3
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 14:51:30 2012 +0200
s3:torture: use smbd/smbd.h instead of just smbd/proto.h in vfstest_chain.c
This fixes compiler warnings regarding incomplete types.
metze
commit af4c99eed0f1f9120256184134be934e5997b573
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 14:50:23 2012 +0200
s3:utils: use smbd/smbd.h instead of just smbd/proto.h
This fixes compiler warnings regarding incomplete types.
metze
commit 7bc328dcb008b29fec1cdd3cfec510a9656bbdbb
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 14:47:52 2012 +0200
s3:modules: we don't need smbd/proto.h in vfs_shadow_copy2.c
metze
commit 16be476d403bf2fffa74f017089962da9b03c103
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 14:47:00 2012 +0200
s3:lib: we don't need smbd/proto.h in smbd_shim.c
metze
commit 04ab606ddbd15cddb235d5f5baedf48299cb1ec7
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 11:53:47 2012 +0200
examples/VFS: don't use smbd/proto.h
metze
commit 9b5c2ca14c120e3700cbb92b1ae19ea6da28a9af
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 11:50:53 2012 +0200
s3:include: move some prototypes (e.g. smb_register_vfs) to vfs.h
These are called from vfs modules, which should not depend on smbd/proto.h
metze
commit c44d2e934c4b45971d537358aba60828164e9b91
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:53:05 2012 +0200
s3:include: remove unused forward declaration of deferred_open_record in smb.h
metze
commit 5306c18f2cf03973b60e544f0750d28eb0b8ef3f
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:48:57 2012 +0200
s3:smbd: move UCF_ defines to smbd.h
metze
commit 4a22dd61c08d0130342012c6ac60eb151f601f3a
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:38:48 2012 +0200
s3:include: move struct smb_filename to vfs.h
metze
commit 22cfc8eca8e6ab652ae9784a81ec0cf843e3dd1d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:37:34 2012 +0200
s3:include: move struct smb_file_time to vfs.h
metze
commit 5fc502c624f13306ba59f8388683d8fdc1c873a5
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:28:49 2012 +0200
s3:include: move struct connection_struct (and sub structs) to vfs.h
metze
commit f88d13b16f179225477618f7bad621934614f464
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:17:57 2012 +0200
s3:include: move struct stream_struct to vfs.h
metze
commit b9500bd988085f01d48d0f444d69afa965a7b04b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:13:45 2012 +0200
s3:include: move struct fd_handle/files_struct to vfs.h
metze
commit f78cc3aca737bf85ad9322f3a3c649b92e6833ee
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:10:17 2012 +0200
s3:includes: move union unid_t to vfs.h
metze
commit 44482ad452cb2b912df8d1748e64653b1bf6bfae
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 10:00:06 2012 +0200
s3:smbd: move struct trans_state to smbd.h
metze
commit ce414977694f72a70b86517b4991ff3bb9711915
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 09:51:02 2012 +0200
s3:smbd: move struct privilege_paths to smbd.h
metze
commit 659f3e681ee089be529f36cc6ba13f0e8e8fc649
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 09:38:05 2012 +0200
s3:smbd: make struct notify_change_buf private to notify.c
metze
commit b5b943dbada86c839e6c575aed6842acd13e5446
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 09:37:39 2012 +0200
s3:smbd: make use of change_notify_fsp_has_changes()
metze
commit dc962c195e24a6323295a596fe864d3bc245b66b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 09:36:36 2012 +0200
s3:smbd: add change_notify_fsp_has_changes()
metze
commit d1d790418230bed0f79942bd1f0838312bb8390c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 08:29:56 2012 +0200
s3:printing: add print_spool_rap_jobid()
metze
commit 6d2d8f54446627dbdc15edbdb60d65a7263012b5
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 18:15:25 2012 +0200
s3:printing: make struct print_file_data private to printspoolss.c
metze
commit e91c22353153d8f701eb307e3edeb937da0cb5da
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 08:42:53 2012 +0200
s3:smbd: use print_spool_rap_jobid() in call_trans2ioctl()
metze
commit c2ffe330b4c33d70699882297122a450caedbecb
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 5 08:33:53 2012 +0200
s3:smbd: use print_spool_rap_jobid() in reply_ioctl()
metze
commit 145fe2ac4c43aef94ae64f991fdf63b6487bda8e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 18:13:55 2012 +0200
s3:smbd: fcb_or_dos_open() can be static
metze
commit 0907b1e20c8cbbf5f6c4daa44492792585e65fbc
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 18:10:51 2012 +0200
s3:smbd: dup_file_fsp() never gets called for print files
metze
commit cf549ff2bcf165060e9fbfcf395ec808f8c562ad
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 17:57:36 2012 +0200
s3:smbd: make struct vfs_fsp_data private to vfs.c
metze
commit 4321e1965783a236f9c84bb6d3c1f230fff11430
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 17:55:28 2012 +0200
s3:smbd: make use of vfs_remove_all_fsp_extensions() in file_free()
metze
commit cd3e658d8251de17f3657670f2026d8b22e6a376
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 17:54:41 2012 +0200
s3:smbd: add vfs_remove_all_fsp_extensions()
metze
commit a8e7c57862ce4511b5e9503265c1dbff575bd373
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 17:43:13 2012 +0200
s3:includes: move struct share_mode_lock to locking.h
metze
commit 05dc49763791cd2d9e6b5c595d02dcf8d8a019e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 14:48:09 2012 +0200
s3:smbd: remove typedef for struct write_cache
metze
commit 4a91321f3a5d051bff64d3fefce0fc9b576ff3bd
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 4 14:46:31 2012 +0200
s3:smbd: make typedef write_cache private to fileio.c
metze
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/shadow_copy_test.c | 1 -
examples/VFS/skel_opaque.c | 1 -
examples/VFS/skel_transparent.c | 1 -
source3/include/fake_file.h | 2 +-
source3/include/local.h | 2 +-
source3/include/locking.h | 4 +
source3/include/printing.h | 3 +-
source3/include/proto.h | 30 ---
source3/include/smb.h | 391 +-----------------------------------
source3/include/smb_acls.h | 33 +++
source3/include/vfs.h | 277 +++++++++++++++++++++++++
source3/lib/smbd_shim.c | 1 -
source3/modules/vfs_shadow_copy2.c | 1 -
source3/printing/printspoolss.c | 20 ++-
source3/printing/queue_process.c | 2 +-
source3/smbd/conn.c | 4 +-
source3/smbd/conn_idle.c | 2 +-
source3/smbd/fake_file.c | 2 +-
source3/smbd/fileio.c | 22 ++-
source3/smbd/files.c | 19 +--
source3/smbd/globals.h | 20 ++-
source3/smbd/ipc.c | 9 +-
source3/smbd/lanman.c | 76 ++++----
source3/smbd/notify.c | 37 ++++
source3/smbd/nttrans.c | 2 +-
source3/smbd/open.c | 24 +-
source3/smbd/password.c | 45 ++--
source3/smbd/process.c | 4 +-
source3/smbd/proto.h | 65 +++----
source3/smbd/reply.c | 16 +-
source3/smbd/service.c | 12 +-
source3/smbd/session.c | 11 +-
source3/smbd/sesssetup.c | 8 +-
source3/smbd/smb2_notify.c | 2 +-
source3/smbd/smb2_sesssetup.c | 6 +-
source3/smbd/smb2_tcon.c | 2 +-
source3/smbd/smbd.h | 51 +++++
source3/smbd/trans2.c | 8 +-
source3/smbd/uid.c | 24 +-
source3/smbd/vfs.c | 31 +++
source3/torture/vfstest_chain.c | 2 +-
source3/utils/status.c | 2 +-
42 files changed, 651 insertions(+), 624 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index 8e6fd69..944136b 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -20,7 +20,6 @@
#include "../source3/include/includes.h"
#include "ntioctl.h"
-#include "smbd/proto.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 1a44a39..89d6992 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -23,7 +23,6 @@
#include "../source3/include/includes.h"
-#include "smbd/proto.h"
/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
SAMBA DEVELOPERS GUIDE!!!!!!
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index ba7e898..8f55d6a 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -23,7 +23,6 @@
#include "../source3/include/includes.h"
-#include "smbd/proto.h"
/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
SAMBA DEVELOPERS GUIDE!!!!!!
diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 0581fbc..da0c35b 100644
--- a/source3/include/fake_file.h
+++ b/source3/include/fake_file.h
@@ -41,7 +41,7 @@ struct fake_file_handle {
enum FAKE_FILE_TYPE is_fake_file_path(const char *path);
enum FAKE_FILE_TYPE is_fake_file(const struct smb_filename *smb_fname);
NTSTATUS open_fake_file(struct smb_request *req, connection_struct *conn,
- uint16_t current_vuid,
+ uint64_t current_vuid,
enum FAKE_FILE_TYPE fake_file_type,
const struct smb_filename *smb_fname,
uint32 access_mask,
diff --git a/source3/include/local.h b/source3/include/local.h
index 11166df..653c671 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -167,7 +167,7 @@
#ifndef SESSION_TEMPLATE
/* Paramaters are 'pid' and 'vuid' */
-#define SESSION_TEMPLATE "smb/%lu/%d"
+#define SESSION_TEMPLATE "smb/%lu/%llu"
#endif
#ifndef SESSION_UTMP_TEMPLATE
diff --git a/source3/include/locking.h b/source3/include/locking.h
index b003b55..3d12fc2 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -98,4 +98,8 @@ struct smbd_lock_element {
uint64_t count;
};
+struct share_mode_lock {
+ struct share_mode_data *data;
+};
+
#endif /* _LOCKING_H_ */
diff --git a/source3/include/printing.h b/source3/include/printing.h
index 3551d8e..cfdf3a4 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -176,7 +176,7 @@ struct tdb_print_db {
NTSTATUS print_spool_open(files_struct *fsp,
const char *fname,
- uint16_t current_vuid);
+ uint64_t current_vuid);
int print_spool_write(files_struct *fsp, const char *data, uint32_t size,
off_t offset, uint32_t *written);
@@ -185,6 +185,7 @@ void print_spool_end(files_struct *fsp, enum file_close_type close_type);
void print_spool_terminate(struct connection_struct *conn,
struct print_file_data *print_file);
+uint16_t print_spool_rap_jobid(struct print_file_data *print_file);
/* The following definitions come from printing/printing.c */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index b5a66b5..b265d7a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -242,36 +242,6 @@ void standard_sub_advanced(const char *servicename, const char *user,
const char *smb_name, const char *domain_name,
char *str, size_t len);
-/* The following definitions come from lib/sysacls.c */
-
-int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p);
-int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p);
-int sys_acl_get_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d);
-int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d);
-int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm);
-int sys_acl_get_perm(SMB_ACL_PERMSET_T permset_d, SMB_ACL_PERM_T perm);
-char *sys_acl_to_text(const struct smb_acl_t *acl_d, ssize_t *len_p);
-SMB_ACL_T sys_acl_init(int count);
-int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p);
-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type);
-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p);
-int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d);
-int sys_acl_free_text(char *text);
-int sys_acl_free_acl(SMB_ACL_T acl_d) ;
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
-int sys_acl_valid(SMB_ACL_T acl_d);
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type);
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp);
-int sys_acl_set_file(vfs_handle_struct *handle,
- const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d);
-int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
- SMB_ACL_T acl_d);
-int sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-int no_acl_syscall_error(int err);
-
/* The following definitions come from lib/sysquotas.c */
int sys_get_quota(const char *path, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9a63d82..832438f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -112,11 +112,6 @@
#define OPENX_FILE_CREATE_IF_NOT_EXIST 0x10
#define OPENX_FILE_FAIL_IF_NOT_EXIST 0
-typedef union unid_t {
- uid_t uid;
- gid_t gid;
-} unid_t;
-
/* pipe string names */
#ifndef MAXSUBAUTHS
@@ -127,30 +122,6 @@ typedef union unid_t {
#include "librpc/gen_ndr/security.h"
-typedef struct write_cache {
- off_t file_size;
- off_t offset;
- size_t alloc_size;
- size_t data_size;
- char *data;
-} write_cache;
-
-struct fd_handle {
- size_t ref_count;
- int fd;
- uint64_t position_information;
- off_t pos;
- uint32 private_options; /* NT Create options, but we only look at
- * NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and
- * NTCREATEX_OPTIONS_PRIVATE_DENY_FCB and
- * NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE
- * for print files *only*, where
- * DELETE_ON_CLOSE is not stored in the share
- * mode database.
- */
- unsigned long gen_id;
-};
-
struct idle_event;
struct share_mode_entry;
struct uuid;
@@ -159,20 +130,6 @@ struct wb_context;
struct rpc_cli_smbd_conn;
struct fncall_context;
-struct share_mode_lock {
- struct share_mode_data *data;
-};
-
-struct vfs_fsp_data {
- struct vfs_fsp_data *next;
- struct vfs_handle_struct *owner;
- void (*destroy)(void *p_data);
- void *_dummy_;
- /* NOTE: This structure contains four pointers so that we can guarantee
- * that the end of the structure is always both 4-byte and 8-byte aligned.
- */
-};
-
/* the basic packet size, assuming no words or bytes */
#define smb_size 39
@@ -191,310 +148,21 @@ struct sys_notify_context {
void *private_data; /* For use by the system backend */
};
-struct notify_change_buf {
- /*
- * If no requests are pending, changes are queued here. Simple array,
- * we only append.
- */
-
- /*
- * num_changes == -1 means that we have got a catch-all change, when
- * asked we just return NT_STATUS_OK without specific changes.
- */
- int num_changes;
- struct notify_change *changes;
-
- /*
- * If no changes are around requests are queued here. Using a linked
- * list, because we have to append at the end and delete from the top.
- */
- struct notify_change_request *requests;
-};
-
-struct print_file_data {
- char *svcname;
- char *docname;
- char *filename;
- struct policy_handle handle;
- uint32_t jobid;
- uint16 rap_jobid;
-};
-
-typedef struct files_struct {
- struct files_struct *next, *prev;
- int fnum;
- struct connection_struct *conn;
- struct fd_handle *fh;
- unsigned int num_smb_operations;
- struct file_id file_id;
- uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */
- uint16 file_pid;
- uint16 vuid;
- write_cache *wcp;
- struct timeval open_time;
- uint32 access_mask; /* NTCreateX access bits (FILE_READ_DATA etc.) */
- uint32 share_access; /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */
-
- bool update_write_time_triggered;
- struct timed_event *update_write_time_event;
- bool update_write_time_on_close;
- struct timespec close_write_time;
- bool write_time_forced;
-
- int oplock_type;
- int sent_oplock_break;
- struct timed_event *oplock_timeout;
- struct lock_struct last_lock_failure;
- int current_lock_count; /* Count the number of outstanding locks and pending locks. */
-
- struct share_mode_entry *pending_break_messages;
- int num_pending_break_messages;
-
- bool can_lock;
- bool can_read;
- bool can_write;
- bool modified;
- bool is_directory;
- bool aio_write_behind;
- bool lockdb_clean;
- bool initial_delete_on_close; /* Only set at NTCreateX if file was created. */
- bool delete_on_close;
- bool posix_open;
- bool is_sparse;
- struct smb_filename *fsp_name;
- uint32_t name_hash; /* Jenkins hash of full pathname. */
-
- struct vfs_fsp_data *vfs_extension;
- struct fake_file_handle *fake_file_handle;
-
- struct notify_change_buf *notify;
-
- struct files_struct *base_fsp; /* placeholder for delete on close */
-
- /*
- * Read-only cached brlock record, thrown away when the
- * brlock.tdb seqnum changes. This avoids fetching data from
- * the brlock.tdb on every read/write call.
- */
- int brlock_seqnum;
- struct byte_range_lock *brlock_rec;
-
- struct dptr_struct *dptr;
-
- /* if not NULL, means this is a print file */
- struct print_file_data *print_file;
-
-} files_struct;
-
#include "ntquotas.h"
#include "sysquotas.h"
-struct vuid_cache_entry {
- struct auth_session_info *session_info;
- uint16_t vuid;
- bool read_only;
-};
-
-struct vuid_cache {
- unsigned int next_entry;
- struct vuid_cache_entry array[VUID_CACHE_SIZE];
-};
-
-typedef struct {
- char *name;
- bool is_wild;
-} name_compare_entry;
-
-struct trans_state {
- struct trans_state *next, *prev;
- uint16 vuid;
- uint64_t mid;
-
- uint32 max_param_return;
- uint32 max_data_return;
- uint32 max_setup_return;
-
- uint8 cmd; /* SMBtrans or SMBtrans2 */
-
- char *name; /* for trans requests */
- uint16 call; /* for trans2 and nttrans requests */
-
- bool close_on_completion;
- bool one_way;
-
- unsigned int setup_count;
- uint16 *setup;
-
- size_t received_data;
- size_t received_param;
-
- size_t total_param;
- char *param;
-
- size_t total_data;
- char *data;
-};
-
-/*
- * Info about an alternate data stream
- */
-
-struct stream_struct {
- off_t size;
- off_t alloc_size;
- char *name;
-};
-
/* Include VFS stuff */
#include "smb_acls.h"
#include "vfs.h"
-struct dfree_cached_info {
- time_t last_dfree_time;
- uint64_t dfree_ret;
- uint64_t bsize;
- uint64_t dfree;
- uint64_t dsize;
-};
-
-struct dptr_struct;
-
-struct share_params {
- int service;
-};
-
-typedef struct connection_struct {
- struct connection_struct *next, *prev;
- struct smbd_server_connection *sconn; /* can be NULL */
- unsigned cnum; /* an index passed over the wire */
- struct share_params *params;
- bool force_user;
- struct vuid_cache vuid_cache;
- bool printer;
- bool ipc;
- bool read_only; /* Attributes for the current user of the share. */
- uint32_t share_access;
- /* Does this filesystem honor
- sub second timestamps on files
- and directories when setting time ? */
- enum timestamp_set_resolution ts_res;
- char *connectpath;
- char *origpath;
-
- struct vfs_handle_struct *vfs_handles; /* for the new plugins */
-
- /*
- * This represents the user information on this connection. Depending
- * on the vuid using this tid, this might change per SMB request.
- */
- struct auth_session_info *session_info;
-
- /*
- * If the "force group" parameter is set, this is the primary gid that
- * may be used in the users token, depending on the vuid using this tid.
- */
- gid_t force_group_gid;
-
- uint16 vuid; /* vuid of user who *opened* this connection, or UID_FIELD_INVALID */
-
- time_t lastused;
- time_t lastused_count;
- int num_files_open;
- unsigned int num_smb_operations; /* Count of smb operations on this tree. */
- int encrypt_level;
- bool encrypted_tid;
-
- /* Semantics requested by the client or forced by the server config. */
- bool case_sensitive;
- bool case_preserve;
- bool short_case_preserve;
-
- /* Semantics provided by the underlying filesystem. */
- int fs_capabilities;
- /* Device number of the directory of the share mount.
- Used to ensure unique FileIndex returns. */
- SMB_DEV_T base_share_dev;
-
- name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
- name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
- name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */
- name_compare_entry *aio_write_behind_list; /* Per-share list of files to use aio write behind on. */
- struct dfree_cached_info *dfree_info;
- struct trans_state *pending_trans;
-
- struct rpc_pipe_client *spoolss_pipe;
-
-} connection_struct;
-
struct current_user {
- connection_struct *conn;
- uint16 vuid;
+ struct connection_struct *conn;
+ uint64_t vuid; /* SMB2 compat */
struct security_unix_token ut;
struct security_token *nt_user_token;
};
-struct smbd_smb2_request;
-struct privilege_paths;
-
-struct smb_request {
- uint8_t cmd;
- uint16 flags2;
- uint16 smbpid;
- uint64_t mid; /* For compatibility with SMB2. */
- uint32_t seqnum;
- uint16 vuid;
- uint16 tid;
- uint8 wct;
- const uint16_t *vwv;
- uint16_t buflen;
- const uint8_t *buf;
- const uint8 *inbuf;
-
- /*
- * Async handling in the main smb processing loop is directed by
- * outbuf: reply_xxx routines indicate sync behaviour by putting their
- * reply into "outbuf". If they leave it as NULL, they take care of it
- * themselves, possibly later.
- *
- * If async handling is wanted, the reply_xxx routine must make sure
- * that it talloc_move()s the smb_req somewhere else.
- */
- uint8 *outbuf;
-
- size_t unread_bytes;
- bool encrypted;
- connection_struct *conn;
- struct smbd_server_connection *sconn;
- struct smb_perfcount_data pcd;
-
- /*
- * Chained request handling
- */
- struct files_struct *chain_fsp;
-
- /*
- * state information for async smb handling
- */
- void *async_priv;
-
- /*
- * Back pointer to smb2 request.
--
Samba Shared Repository
More information about the samba-cvs
mailing list