Changeset 587 for vendor/current/source3/smbd/notify.c

Timestamp:

Jun 29, 2011, 7:36:41 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.6

File:

• vendor/current/source3/smbd/notify.c (modified) (3 diffs)

vendor/current/source3/smbd/notify.c

@@ -77 +77 @@
                 struct notify_change *c;
                 size_t namelen;
+                int    rem = 0;
                 uint32 u32_tmp; /* Temp arg to prs_uint32 to avoid
                                  * signed/unsigned issues */
@@ -102 +103 @@
 
                 u32_tmp = (i == num_changes-1) ? 0 : namelen + 12;
+
+                /* Align on 4-byte boundary according to MS-CIFS 2.2.7.4.2 */
+                if ((rem = u32_tmp % 4 ) != 0)
+                        u32_tmp += 4 - rem;
+
                 if (!prs_uint32("offset", ps, 1, &u32_tmp)) goto fail;
 
@@ -116 +122 @@
                  */
                 prs_set_offset(ps, prs_offset(ps)-2);
+
+                if (rem != 0) {
+                        if (!prs_align_custom(ps, 4)) goto fail;
+                }
 
                 TALLOC_FREE(uni_name.buffer);