Changeset 745 for trunk/server/source4/libcli/raw/rawfileinfo.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/raw/rawfileinfo.c (modified) (2 diffs)

trunk/server/source4/libcli/raw/rawfileinfo.c

@@ -48 +48 @@
 
         while (blob.length - ofs >= 24) {
-                uint_t n = io->num_streams;
+                unsigned int n = io->num_streams;
                 uint32_t nlen, len;
                 bool ret;
@@ -254 +254 @@
                 NT_STATUS_HAVE_NO_MEMORY(parms->query_secdesc.out.sd);
 
-                ndr_err = ndr_pull_struct_blob(blob, mem_ctx, NULL, 
-                                               parms->query_secdesc.out.sd,
-                                               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
+                ndr_err = ndr_pull_struct_blob(blob, mem_ctx,
+                        parms->query_secdesc.out.sd,
+                        (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
                 if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                         return ndr_map_error2ntstatus(ndr_err);