Changeset 740 for vendor/current/source3/libsmb/smb_share_modes.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/libsmb/smb_share_modes.c (modified) (10 diffs)

vendor/current/source3/libsmb/smb_share_modes.c

@@ -26 +26 @@
 
 #include "includes.h"
+
 #include "smb_share_modes.h"
+
 
 /* Database context handle. */
@@ -68 +70 @@
 
         smb_db->smb_tdb = tdb_open(db_path,
-                                0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST,
+                                0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST,
                                 O_RDWR|O_CREAT,
                                 0644);
@@ -156 +158 @@
 
 static void create_share_mode_entry(struct share_mode_entry *out,
-                                const struct smb_share_mode_entry *in)
+                                const struct smb_share_mode_entry *in,
+                                uint32_t name_hash)
 {
         memset(out, '\0', sizeof(struct share_mode_entry));
@@ -171 +174 @@
         out->uid = (uint32)geteuid();
         out->flags = 0;
+
 }
 
@@ -256 +260 @@
         }
 
-        *p_delete_on_close = ld->u.s.delete_on_close;
+        *p_delete_on_close = ld->u.s.;
         *pp_list = list;
         free(db_data.dptr);
         return list_num;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -282 +311 @@
         uint8 *new_data_p = NULL;
         size_t new_data_size = 0;
+
+
+
+
+
+
 
         db_data = tdb_fetch(db_ctx->smb_tdb, locking_key);
@@ -297 +332 @@
                 memset(ld, '\0', sizeof(struct locking_data));
                 ld->u.s.num_share_mode_entries = 1;
-                ld->u.s.delete_on_close = 0;
-                ld->u.s.delete_token_size = 0;
+                ld->u.s.num_delete_token_entries = 0;
                 shares = (struct share_mode_entry *)(db_data.dptr + sizeof(struct locking_data));
-                create_share_mode_entry(shares, new_entry);
+                create_share_mode_entry(shares, new_entry);
 
                 memcpy(db_data.dptr + sizeof(struct locking_data) + sizeof(struct share_mode_entry),
@@ -339 +373 @@
                         (orig_num_share_modes * sizeof(struct share_mode_entry)));
 
-        create_share_mode_entry(shares, new_entry);
+        create_share_mode_entry(shares, new_entry);
 
         ld = (struct locking_data *)new_data_p;
         ld->u.s.num_share_mode_entries++;
 
-        /* Append the original delete_token and filenames. */
+        /* Append the original delete_token and filenames. */
         memcpy(new_data_p + sizeof(struct locking_data) + (ld->u.s.num_share_mode_entries * sizeof(struct share_mode_entry)),
                 db_data.dptr + sizeof(struct locking_data) + (orig_num_share_modes * sizeof(struct share_mode_entry)),
@@ -461 +495 @@
         }
 
-        /* Copy any delete token plus the terminating filenames. */
+        /* Copy any delete token plus the terminating filenames. */
         remaining_ptr = db_data.dptr + sizeof(struct locking_data) + (orig_num_share_modes * sizeof(struct share_mode_entry));
         remaining_size = db_data.dsize - (remaining_ptr - db_data.dptr);
@@ -522 +556 @@
 
                 if (share_mode_entry_equal(set_entry, share)) {
-                        create_share_mode_entry(share, new_entry);
+                        create_share_mode_entry(share, new_entry);
                         found_entry = 1;
                         break;