Changeset 204 for branches/samba-3.2.x/source/include

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

Location:

branches/samba-3.2.x/source/include

Files:

• config.h.in (modified) (2 diffs)
• proto.h (modified) (6 diffs)
• smb.h (modified) (1 diff)
• version.h (modified) (1 diff)

branches/samba-3.2.x/source/include/config.h.in

@@ -1699 +1699 @@
 #undef HAVE_STAT_ST_ATIMENSEC
 
+/* whether struct stat contains st_birthtime */
+#undef HAVE_STAT_ST_BIRTHTIME
+
+/* whether struct stat contains st_birthtimensec */
+#undef HAVE_STAT_ST_BIRTHTIMENSEC
+
+/* whether struct stat contains st_birthtimespec */
+#undef HAVE_STAT_ST_BIRTHTIMESPEC
+
 /* Whether the stat struct has a st_blksize property */
 #undef HAVE_STAT_ST_BLKSIZE
@@ -1821 +1830 @@
 /* Define to 1 if `method_version' is member of `struct secmethod_table'. */
 #undef HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION
+
+/* Whether we have the struct sigevent */
+#undef HAVE_STRUCT_SIGEVENT
+
+/* Define to 1 if `sigev_value.sigval_ptr' is member of `struct sigevent'. */
+#undef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR
+
+/* Define to 1 if `sigev_value.sival_ptr' is member of `struct sigevent'. */
+#undef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR
 
 /* Define to 1 if the system has the type `struct sockaddr'. */

branches/samba-3.2.x/source/include/proto.h

@@ -616 +616 @@
 bool is_local_net_v4(struct in_addr from);
 int iface_count(void);
-int iface_count_v4(void);
+int iface_count_v4_nl(void);
 const struct in_addr *first_ipv4_iface(void);
 struct interface *get_interface(int n);
@@ -1148 +1148 @@
 void put_long_date_timespec(char *p, struct timespec ts);
 void put_long_date(char *p, time_t t);
-time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs);
-struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs);
+struct timespec get_create_timespec(const SMB_STRUCT_STAT *pst,bool fake_dirs);
 struct timespec get_atimespec(const SMB_STRUCT_STAT *pst);
 void set_atimespec(SMB_STRUCT_STAT *pst, struct timespec ts);
@@ -4818 +4817 @@
 bool netsamlogon_cache_init(void);
 bool netsamlogon_cache_shutdown(void);
-void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, struct netr_SamInfo3 *info3);
+void netsamlogon_clear_cached_user(struct netr_SamInfo3 *info3);
 bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3);
 struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const DOM_SID *user_sid);
@@ -5119 +5118 @@
 bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok);
 bool set_allow_initial_delete_on_close(struct share_mode_lock *lck, files_struct *fsp, bool delete_on_close);
-bool set_write_time(struct file_id fileid, struct timespec write_time,
-                    bool overwrite);
+bool set_sticky_write_time(struct file_id fileid, struct timespec write_time);
+bool set_write_time(struct file_id fileid, struct timespec write_time);
 int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *,
                                  const char *, void *),
@@ -9399 +9398 @@
                      bool newfile);
 int file_ntimes(connection_struct *conn, const char *fname, const struct timespec ts[2]);
-bool set_write_time_path(connection_struct *conn, const char *fname,
-                         struct file_id fileid, const struct timespec mtime,
-                         bool overwrite);
-bool set_write_time_fsp(struct files_struct *fsp, const struct timespec mtime,
-                        bool overwrite);
+bool set_sticky_write_time_path(connection_struct *conn, const char *fname,
+                         struct file_id fileid, const struct timespec mtime);
+bool set_sticky_write_time_fsp(struct files_struct *fsp, const struct timespec mtime);
+bool update_write_time(struct files_struct *fsp);
 
 /* The following definitions come from smbd/error.c  */
@@ -9443 +9441 @@
 ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n);
 void trigger_write_time_update(struct files_struct *fsp);
+void trigger_write_time_update_immediate(struct files_struct *fsp);
 ssize_t write_file(struct smb_request *req,
                         files_struct *fsp,

branches/samba-3.2.x/source/include/smb.h

@@ -1378 +1378 @@
 #define FILE_OPEN_BY_FILE_ID      0x2000
 
-/* Private create options used by the ntcreatex processing code. From Samba4. */
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS     0x01000000
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB     0x02000000
+#define NTCREATEX_OPTIONS_MUST_IGNORE_MASK      (0x008F0480)
+
+#define NTCREATEX_OPTIONS_INVALID_PARAM_MASK    (0xFF100030)
+
+/*
+ * Private create options used by the ntcreatex processing code. From Samba4.
+ * We reuse some ignored flags for private use.
+ */
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS     0x00010000
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB     0x00020000
 
 /* Private options for streams support */
-#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x04000000
+#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x00040000
 
 /* Responses when opening a file. */

branches/samba-3.2.x/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 2
-#define SAMBA_VERSION_RELEASE 3
-#define SAMBA_VERSION_OFFICIAL_STRING "3.2.3"
+#define SAMBA_VERSION_RELEASE 4
+#define SAMBA_VERSION_OFFICIAL_STRING "3.2.4"
 #define SAMBA_VERSION_STRING samba_version_string()