Changeset 141 for trunk/samba/source/locking

Timestamp:

Aug 7, 2008, 11:49:04 AM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.1

File:

• trunk/samba/source/locking/locking.c (modified) (7 diffs)

trunk/samba/source/locking/locking.c

@@ -494 +494 @@
 static bool parse_share_modes(TDB_DATA dbuf, struct share_mode_lock *lck)
 {
-        struct locking_data *data;
+        struct locking_data data;
         int i;
 
@@ -501 +501 @@
         }
 
-        data = (struct locking_data *)dbuf.dptr;
-
-        lck->delete_on_close = data->u.s.delete_on_close;
-        lck->old_write_time = data->u.s.old_write_time;
-        lck->changed_write_time = data->u.s.changed_write_time;
-        lck->num_share_modes = data->u.s.num_share_mode_entries;
+        memcpy(&data, dbuf.dptr, sizeof(data));
+
+        lck->delete_on_close = data.u.s.delete_on_close;
+        lck->old_write_time = data.u.s.old_write_time;
+        lck->changed_write_time = data.u.s.changed_write_time;
+        lck->num_share_modes = data.u.s.num_share_mode_entries;
 
         DEBUG(10, ("parse_share_modes: delete_on_close: %d, owrt: %s, "
@@ -516 +516 @@
                               convert_timespec_to_time_t(
                                       lck->changed_write_time)),
-                   (unsigned int)data->u.s.delete_token_size,
+                   (unsigned int)data.u.s.delete_token_size,
                    lck->num_share_modes));
 
@@ -536 +536 @@
                                   
                 lck->share_modes = (struct share_mode_entry *)
-                        TALLOC_MEMDUP(lck, dbuf.dptr+sizeof(*data),
+                        TALLOC_MEMDUP(lck,
+                                      dbuf.dptr+sizeof(struct locking_data),
                                       lck->num_share_modes *
                                       sizeof(struct share_mode_entry));
@@ -546 +547 @@
 
         /* Get any delete token. */
-        if (data->u.s.delete_token_size) {
-                uint8 *p = dbuf.dptr + sizeof(*data) +
+        if (data.u.s.delete_token_size) {
+                uint8 *p = dbuf.dptr + sizeof(struct locking_data) +
                                 (lck->num_share_modes *
                                 sizeof(struct share_mode_entry));
 
-                if ((data->u.s.delete_token_size < sizeof(uid_t) + sizeof(gid_t)) ||
-                                ((data->u.s.delete_token_size - sizeof(uid_t)) % sizeof(gid_t)) != 0) {
+                if ((data.u.s.delete_token_size < sizeof(uid_t) + sizeof(gid_t)) ||
+                                ((data.u.s.delete_token_size - sizeof(uid_t)) % sizeof(gid_t)) != 0) {
                         DEBUG(0, ("parse_share_modes: invalid token size %d\n",
-                                data->u.s.delete_token_size));
+                                data.u.s.delete_token_size));
                         smb_panic("parse_share_modes: invalid token size");
                 }
@@ -570 +571 @@
 
                 /* Any supplementary groups ? */
-                lck->delete_token->ngroups = (data->u.s.delete_token_size > (sizeof(uid_t) + sizeof(gid_t))) ?
-                                        ((data->u.s.delete_token_size -
+                lck->delete_token->ngroups = (data.u.s.delete_token_size > (sizeof(uid_t) + sizeof(gid_t))) ?
+                                        ((data.u.s.delete_token_size -
                                                 (sizeof(uid_t) + sizeof(gid_t)))/sizeof(gid_t)) : 0;
 
@@ -593 +594 @@
 
         /* Save off the associated service path and filename. */
-        lck->servicepath = (const char *)dbuf.dptr + sizeof(*data) +
+        lck->servicepath = (const char *)dbuf.dptr + sizeof(struct locking_data) +
                 (lck->num_share_modes * sizeof(struct share_mode_entry)) +
-                data->u.s.delete_token_size;
-
-        lck->filename = (const char *)dbuf.dptr + sizeof(*data) +
+                data.u.s.delete_token_size;
+
+        lck->filename = (const char *)dbuf.dptr + sizeof(struct locking_data) +
                 (lck->num_share_modes * sizeof(struct share_mode_entry)) +
-                data->u.s.delete_token_size +
+                data.u.s.delete_token_size +
                 strlen(lck->servicepath) + 1;