s3-eventlog: fix various invalid memcpy in read_package_entry().

Guenther
(cherry picked from commit 75fff603625e0259f187e0fa47efd85887092fae)

diff --git a/source/rpc_server/srv_eventlog_nt.c b/source/rpc_server/srv_eventlog_nt.c
index 8e758bbf83f3eacf43f98048d59e2f2008c3907c..563dc14e5f0d0e00a7d783b53c41ea5611c8c1d6 100644 (file)
--- a/source/rpc_server/srv_eventlog_nt.c
+++ b/source/rpc_server/srv_eventlog_nt.c
@@ -543,30 +543,30 @@ static Eventlog_entry *read_package_entry( prs_struct * ps,
                return NULL;
        }
        offset = entry->data;
-       memcpy( offset, &( entry->data_record.source_name ),
+       memcpy( offset, entry->data_record.source_name,
                entry->data_record.source_name_len );
        offset += entry->data_record.source_name_len;
-       memcpy( offset, &( entry->data_record.computer_name ),
+       memcpy( offset, entry->data_record.computer_name,
                entry->data_record.computer_name_len );
        offset += entry->data_record.computer_name_len;
        /* SID needs to be DWORD-aligned */
        offset += entry->data_record.sid_padding;
        entry->record.user_sid_offset =
                sizeof( Eventlog_record ) + ( offset - entry->data );
-       memcpy( offset, &( entry->data_record.sid ),
+       memcpy( offset, entry->data_record.sid,
                entry->record.user_sid_length );
        offset += entry->record.user_sid_length;
        /* Now do the strings */
        entry->record.string_offset =
                sizeof( Eventlog_record ) + ( offset - entry->data );
-       memcpy( offset, &( entry->data_record.strings ),
+       memcpy( offset, entry->data_record.strings,
                entry->data_record.strings_len );
        offset += entry->data_record.strings_len;
        /* Now do the data */
        entry->record.data_length = entry->data_record.user_data_len;
        entry->record.data_offset =
                sizeof( Eventlog_record ) + ( offset - entry->data );
-       memcpy( offset, &( entry->data_record.user_data ),
+       memcpy( offset, entry->data_record.user_data,
                entry->data_record.user_data_len );
        offset += entry->data_record.user_data_len;