Changeset 232 for branches/samba-3.2.x/source/rpc_server

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/source/rpc_server

Files:

• srv_eventlog_nt.c (modified) (4 diffs)
• srv_samr_nt.c (modified) (2 diffs)

branches/samba-3.2.x/source/rpc_server/srv_eventlog_nt.c

@@ -544 +544 @@
         }
         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;
@@ -554 +554 @@
         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;
@@ -560 +560 @@
         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;
@@ -567 +567 @@
         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;

branches/samba-3.2.x/source/rpc_server/srv_samr_nt.c

@@ -2131 +2131 @@
 
         status = access_check_samr_function(acc_granted,
-                                            SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
+                                            0, /* Don't know the acc_bits yet */
                                             "_samr__LookupRids");
         if (!NT_STATUS_IS_OK(status)) {
@@ -2710 +2710 @@
 
         status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_DOMAIN_OPEN_ACCOUNT,
+                                            SAMR_USER_ACCESS_GET_ATTRIBUTES,
                                             "_samr_QueryUserInfo");
         if (!NT_STATUS_IS_OK(status)) {