diff options
| author | Christof Schmitt <christof.schmitt@us.ibm.com> | 2013-08-05 11:21:59 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-08-06 04:03:17 +0200 |
| commit | eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696 (patch) | |
| tree | 36721835efd55fa38041578feb37671a669a3251 | |
| parent | 30e724cbff1ecd90e5a676831902d1e41ec1b347 (diff) | |
| download | samba-eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696.tar.gz samba-eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696.tar.bz2 samba-eb50fb8f3bf670bd7d1cf8fd4368ef4a73083696.zip | |
FSCTL_GET_SHADOW_COPY_DATA: Don't return 4 extra bytes at end
labels_data_count already accounts for the unicode null character at the
end of the array. There is no need in adding space for it again.
Signed-off-by: Christof Schmitt <christof.schmitt@us.ibm.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Aug 6 04:03:17 CEST 2013 on sn-devel-104
| -rw-r--r-- | source3/modules/vfs_default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index efb020425c..304ef372f3 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -1141,7 +1141,7 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle, if (!labels) { *out_len = 16; } else { - *out_len = 12 + labels_data_count + 4; + *out_len = 12 + labels_data_count; } if (max_out_len < *out_len) { @@ -1168,7 +1168,7 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle, } /* needed_data_count 4 bytes */ - SIVAL(cur_pdata, 8, labels_data_count + 4); + SIVAL(cur_pdata, 8, labels_data_count); cur_pdata += 12; |