s3: Happy New Year 2012

[ddiss/samba.git] / source3 / include / smb.h

diff --git a/source3/include/smb.h b/source3/include/smb.h
index b46f49881ef6cfbac6fa87485591ef9cc6175f05..2221b7276381475fdd4c1924f3cb4588fdc37c2f 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -30,7 +30,7 @@
 #include "libds/common/roles.h"
 
 /* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE      "Copyright Andrew Tridgell and the Samba Team 1992-2011"
+#define COPYRIGHT_STARTUP_MESSAGE      "Copyright Andrew Tridgell and the Samba Team 1992-2012"
 
 
 #if defined(LARGE_SMB_OFF_T)
@@ -131,19 +131,6 @@ typedef union unid_t {
 
 #include "librpc/gen_ndr/security.h"
 
-/*
- * The complete list of SIDS belonging to this user.
- * Created when a vuid is registered.
- * The definition of the user_sids array is as follows :
- *
- * token->user_sids[0] = primary user SID.
- * token->user_sids[1] = primary group SID.
- * token->user_sids[2..num_sids] = supplementary group SIDS.
- */
-
-#define PRIMARY_USER_SID_INDEX 0
-#define PRIMARY_GROUP_SID_INDEX 1
-
 typedef struct write_cache {
        SMB_OFF_T file_size;
        SMB_OFF_T offset;
@@ -528,42 +515,10 @@ struct interface {
        struct sockaddr_storage bcast;
 };
 
-/* Internal message queue for deferred opens. */
-struct pending_message_list {
-       struct pending_message_list *next, *prev;
-       struct timeval request_time; /* When was this first issued? */
-       struct timed_event *te;
-       struct smb_perfcount_data pcd;
-       uint32_t seqnum;
-       bool encrypted;
-       bool processed;
-       DATA_BLOB buf;
-       DATA_BLOB private_data;
-};
-
 #define SHARE_MODE_FLAG_POSIX_OPEN     0x1
 
 #include "librpc/gen_ndr/server_id.h"
 
-/* struct returned by get_share_modes */
-struct share_mode_entry {
-       struct server_id pid;
-       uint64_t op_mid;        /* For compatibility with SMB2 opens. */
-       uint16 op_type;
-       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). */
-       uint32 private_options; /* NT Create options, but we only look at
-                                * NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and
-                                * NTCREATEX_OPTIONS_PRIVATE_DENY_FCB for
-                                * smbstatus and swat */
-       struct timeval time;
-       struct file_id id;
-       unsigned long share_file_id;
-       uint32 uid;             /* uid of file opener. */
-       uint16 flags;           /* See SHARE_MODE_XX above. */
-       uint32_t name_hash;             /* Jenkins hash of full pathname. */
-};
-
 /* oplock break message definition - linearization of share_mode_entry.
 
 Offset  Data                   length.
@@ -605,56 +560,6 @@ Offset  Data                       length.
 #define OP_BREAK_MSG_VNN_OFFSET 72
 #define MSG_SMB_SHARE_MODE_ENTRY_SIZE 76
 
-struct delete_token {
-       uint32_t name_hash;
-       struct security_unix_token *delete_token;
-};
-
-struct share_mode_lock {
-       const char *servicepath; /* canonicalized. */
-       const char *base_name;
-       const char *stream_name;
-       struct file_id id;
-       int num_share_modes;
-       struct share_mode_entry *share_modes;
-       int num_delete_tokens;
-       struct delete_token *delete_tokens;
-       struct timespec old_write_time;
-       struct timespec changed_write_time;
-       bool fresh;
-       bool modified;
-       struct db_record *record;
-};
-
-/*
- * Internal structure of locking.tdb share mode db.
- * Used by locking.c and libsmbsharemodes.c
- */
-
-struct locking_data {
-       union {
-               struct {
-                       int num_share_mode_entries;
-                       struct timespec old_write_time;
-                       struct timespec changed_write_time;
-                       uint32 num_delete_token_entries;
-               } s;
-               struct share_mode_entry dummy; /* Needed for alignment. */
-       } u;
-       /* The following four entries are implicit
-
-          (1) struct share_mode_entry modes[num_share_mode_entries];
-
-          (2) A num_delete_token_entries of structs {
-               uint32_t len_delete_token;
-               char unix_token[len_delete_token] (divisible by 4).
-          };
-
-          (3) char share_name[];
-          (4) char file_name[];
-        */
-};
-
 #define NT_HASH_LEN 16
 #define LM_HASH_LEN 16
 
@@ -1152,11 +1057,11 @@ enum acl_compatibility {ACL_COMPAT_AUTO, ACL_COMPAT_WINNT, ACL_COMPAT_WIN2K};
                                 * inform potential level2 holders on
                                 * write. */
 #define DEFERRED_OPEN_ENTRY            0x20
-#define UNUSED_SHARE_MODE_ENTRY        0x40
+/* #define UNUSED_SHARE_MODE_ENTRY     0x40 */   /* Not used anymore */
 #define FORCE_OPLOCK_BREAK_TO_NONE     0x80
 
 /* None of the following should ever appear in fsp->oplock_request. */
-#define SAMBA_PRIVATE_OPLOCK_MASK (INTERNAL_OPEN_ONLY|DEFERRED_OPEN_ENTRY|UNUSED_SHARE_MODE_ENTRY|FORCE_OPLOCK_BREAK_TO_NONE)
+#define SAMBA_PRIVATE_OPLOCK_MASK (INTERNAL_OPEN_ONLY|DEFERRED_OPEN_ENTRY|FORCE_OPLOCK_BREAK_TO_NONE)
 
 #define EXCLUSIVE_OPLOCK_TYPE(lck) ((lck) & ((unsigned int)EXCLUSIVE_OPLOCK|(unsigned int)BATCH_OPLOCK))
 #define BATCH_OPLOCK_TYPE(lck) ((lck) & (unsigned int)BATCH_OPLOCK)
@@ -1310,7 +1215,7 @@ typedef struct user_struct {
 
        struct auth_session_info *session_info;
 
-       struct auth_ntlmssp_state *auth_ntlmssp_state;
+       struct auth_generic_state *auth_ntlmssp_state;
 } user_struct;
 
 /*
@@ -1441,12 +1346,6 @@ struct smb_filename {
        SMB_STRUCT_STAT st;
 };
 
-/* struct for maintaining the child processes that get spawned from smbd */
-struct child_pid {
-       struct child_pid *prev, *next;
-       pid_t pid;
-};
-
 /* Used to keep track of deferred opens. */
 struct deferred_open_record;