Changeset 480 for trunk/server/source3/include

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/include/config.h.in (modified) (1 diff)
• source3/include/libsmbclient.h (modified) (5 diffs)
• source3/include/proto.h (modified) (5 diffs)
• source3/include/secrets.h (modified) (1 diff)
• source3/include/smb.h (modified) (1 diff)
• source3/include/version.h (modified) (1 diff)

trunk/server/source3/include/config.h.in

@@ -1430 +1430 @@
 /* Define to 1 if you have the <linux/inotify.h> header file. */
 #undef HAVE_LINUX_INOTIFY_H
+
+/* Whether the system has IPV6_V6ONLY in linux/in6.h */
+#undef HAVE_LINUX_IPV6_V6ONLY_26
 
 /* Whether the Linux ptrace(2) interface is available. */

trunk/server/source3/include/libsmbclient.h

@@ -1268 +1268 @@
  * @param bufsize   Size of buf in bytes
  *
- * @return          Number of bytes read, < 0 on error with errno set:
+ * @return          Number of bytes read;
+ *                  0 upon EOF;
+ *                  < 0 on error, with errno set:
  *                  - EISDIR fd refers to a directory
  *                  - EBADF  fd  is  not  a valid file descriptor or 
- *                  is not open for reading.
+ *                    is not open for reading.
  *                  - EINVAL fd is attached to an object which is 
- *                  unsuitable for reading, or no buffer passed or
- *                  smbc_init not called.
+ *                    unsuitable for reading, or no buffer passed or
+ *                    smbc_init not called.
  *
  * @see             smbc_open(), smbc_write()
@@ -1619 +1621 @@
  *                  standard Unix struct stat information.
  * 
- * @return          EBADF  filedes is bad.
+ * @return          0 on success, < 0 on error with errno set:
+ *                  - EBADF  filedes is bad.
  *                  - EACCES Permission denied.
  *                  - EBADF fd is not a valid file descriptor
@@ -1640 +1643 @@
  *                  standard Unix struct statvfs information.
  * 
- * @return          EBADF  filedes is bad.
+ * @return          0 on success, < 0 on error with errno set:
+ *                  - EBADF  filedes is bad.
  *                  - EACCES Permission denied.
  *                  - EBADF fd is not a valid file descriptor
@@ -1663 +1667 @@
  *                  standard Unix struct statvfs information.
  * 
- * @return          EBADF  filedes is bad.
+ * @return          0 on success, < 0 on error with errno set:
+ *                  - EBADF  filedes is bad.
  *                  - EACCES Permission denied.
  *                  - EBADF fd is not a valid file descriptor
@@ -1685 +1690 @@
  * @param size      size to truncate the file to
  * 
- * @return          EBADF  filedes is bad.
+ * @return          0 on success, < 0 on error with errno set:
+ *                  - EBADF  filedes is bad.
  *                  - EACCES Permission denied.
  *                  - EBADF fd is not a valid file descriptor

trunk/server/source3/include/proto.h

@@ -1810 +1810 @@
                                                 const char *domain,
                                                 const char *sitename,
-                                                struct sockaddr_storage *pss);
+                                                struct sockaddr_storage *pss,
+                                                const char *kdc_name);
 
 /* The following definitions come from libads/kerberos_keytab.c  */
@@ -4713 +4714 @@
 bool secrets_delete_domain_sid(const char *domain);
 bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel);
+char *secrets_fetch_prev_machine_password(const char *domain);
 char *secrets_fetch_machine_password(const char *domain,
                                      time_t *pass_last_set_time,
@@ -4778 +4780 @@
                      print_queue_struct *buf,
                      print_status_struct *status,bool first);
+uint32_t print_parse_jobid(const char *fname);
 
 /* The following definitions come from printing/notify.c  */
@@ -6482 +6485 @@
                                 bool dfs_pathnames,
                                 const char *name_in,
+                                bool allow_wcards,
                                 char **pp_name_out,
                                 bool *ppath_contains_wcard);
@@ -7048 +7052 @@
 
 uint64_t smb_roundup(connection_struct *conn, uint64_t val);
+uint64_t get_FileIndex(connection_struct *conn, const SMB_STRUCT_STAT *psbuf);
 NTSTATUS get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn,
                       files_struct *fsp, const char *fname,

trunk/server/source3/include/secrets.h

@@ -26 +26 @@
 #define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC"
 #define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD"
+#define SECRETS_MACHINE_PASSWORD_PREV "SECRETS/MACHINE_PASSWORD.PREV"
 #define SECRETS_MACHINE_LAST_CHANGE_TIME "SECRETS/MACHINE_LAST_CHANGE_TIME"
 #define SECRETS_MACHINE_SEC_CHANNEL_TYPE "SECRETS/MACHINE_SEC_CHANNEL_TYPE"

trunk/server/source3/include/smb.h

@@ -608 +608 @@
         /* 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. */

trunk/server/source3/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 5
-#define SAMBA_VERSION_RELEASE 2
-#define SAMBA_VERSION_OFFICIAL_STRING "3.5.2"
+#define SAMBA_VERSION_RELEASE 4
+#define SAMBA_VERSION_OFFICIAL_STRING "3.5.4"
 #define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.2.0"
-#define SAMBA_VERSION_VENDOR_PATCH 468
-#define SAMBA_VERSION_VENDOR_PATCH_STRING "468"
+#define SAMBA_VERSION_VENDOR_PATCH 479
+#define SAMBA_VERSION_VENDOR_PATCH_STRING "479"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION