Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: remoting/host/win/security_descriptor.cc

Issue 1549493004: Use std::move() instead of .Pass() in remoting/host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/win/security_descriptor.h" 5 #include "remoting/host/win/security_descriptor.h"
6 6
7 #include <sddl.h> 7 #include <sddl.h>
8 8
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 11
12 namespace remoting { 12 namespace remoting {
13 13
14 ScopedSd ConvertSddlToSd(const std::string& sddl) { 14 ScopedSd ConvertSddlToSd(const std::string& sddl) {
15 PSECURITY_DESCRIPTOR raw_sd = nullptr; 15 PSECURITY_DESCRIPTOR raw_sd = nullptr;
16 ULONG length = 0; 16 ULONG length = 0;
17 if (!ConvertStringSecurityDescriptorToSecurityDescriptor( 17 if (!ConvertStringSecurityDescriptorToSecurityDescriptor(
18 base::UTF8ToUTF16(sddl).c_str(), SDDL_REVISION_1, &raw_sd, &length)) { 18 base::UTF8ToUTF16(sddl).c_str(), SDDL_REVISION_1, &raw_sd, &length)) {
19 return ScopedSd(); 19 return ScopedSd();
20 } 20 }
21 21
22 ScopedSd sd(length); 22 ScopedSd sd(length);
23 memcpy(sd.get(), raw_sd, length); 23 memcpy(sd.get(), raw_sd, length);
24 24
25 LocalFree(raw_sd); 25 LocalFree(raw_sd);
26 return sd.Pass(); 26 return sd;
27 } 27 }
28 28
29 // Converts a SID into a text string. 29 // Converts a SID into a text string.
30 std::string ConvertSidToString(SID* sid) { 30 std::string ConvertSidToString(SID* sid) {
31 base::char16* c_sid_string = nullptr; 31 base::char16* c_sid_string = nullptr;
32 if (!ConvertSidToStringSid(sid, &c_sid_string)) 32 if (!ConvertSidToStringSid(sid, &c_sid_string))
33 return std::string(); 33 return std::string();
34 34
35 base::string16 sid_string(c_sid_string); 35 base::string16 sid_string(c_sid_string);
36 LocalFree(c_sid_string); 36 LocalFree(c_sid_string);
(...skipping 14 matching lines...) Expand all
51 return ScopedSid(); 51 return ScopedSid();
52 52
53 for (uint32 i = 0; i < groups->GroupCount; ++i) { 53 for (uint32 i = 0; i < groups->GroupCount; ++i) {
54 if ((groups->Groups[i].Attributes & SE_GROUP_LOGON_ID) == 54 if ((groups->Groups[i].Attributes & SE_GROUP_LOGON_ID) ==
55 SE_GROUP_LOGON_ID) { 55 SE_GROUP_LOGON_ID) {
56 length = GetLengthSid(groups->Groups[i].Sid); 56 length = GetLengthSid(groups->Groups[i].Sid);
57 ScopedSid logon_sid(length); 57 ScopedSid logon_sid(length);
58 if (!CopySid(length, logon_sid.get(), groups->Groups[i].Sid)) 58 if (!CopySid(length, logon_sid.get(), groups->Groups[i].Sid))
59 return ScopedSid(); 59 return ScopedSid();
60 60
61 return logon_sid.Pass(); 61 return logon_sid;
62 } 62 }
63 } 63 }
64 64
65 return ScopedSid(); 65 return ScopedSid();
66 } 66 }
67 67
68 bool MakeScopedAbsoluteSd(const ScopedSd& relative_sd, 68 bool MakeScopedAbsoluteSd(const ScopedSd& relative_sd,
69 ScopedSd* absolute_sd, 69 ScopedSd* absolute_sd,
70 ScopedAcl* dacl, 70 ScopedAcl* dacl,
71 ScopedSid* group, 71 ScopedSid* group,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 absolute_sd->Swap(local_absolute_sd); 117 absolute_sd->Swap(local_absolute_sd);
118 dacl->Swap(local_dacl); 118 dacl->Swap(local_dacl);
119 group->Swap(local_group); 119 group->Swap(local_group);
120 owner->Swap(local_owner); 120 owner->Swap(local_owner);
121 sacl->Swap(local_sacl); 121 sacl->Swap(local_sacl);
122 return true; 122 return true;
123 } 123 }
124 124
125 } // namespace remoting 125 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698