OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chromeos/network/client_cert_resolver.h" | 5 #include "chromeos/network/client_cert_resolver.h" |
6 | 6 |
7 #include <cert.h> | 7 #include <cert.h> |
8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA | 8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA |
9 #include <pk11pub.h> | 9 #include <pk11pub.h> |
10 | 10 |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 network_state_handler_->GetFavoriteList(&networks); | 337 network_state_handler_->GetFavoriteList(&networks); |
338 ResolveNetworks(networks); | 338 ResolveNetworks(networks); |
339 } | 339 } |
340 | 340 |
341 void ClientCertResolver::PolicyApplied(const std::string& service_path) { | 341 void ClientCertResolver::PolicyApplied(const std::string& service_path) { |
342 VLOG(2) << "PolicyApplied " << service_path; | 342 VLOG(2) << "PolicyApplied " << service_path; |
343 if (!ClientCertificatesLoaded()) | 343 if (!ClientCertificatesLoaded()) |
344 return; | 344 return; |
345 // Compare this network with all certificates. | 345 // Compare this network with all certificates. |
346 const FavoriteState* network = | 346 const FavoriteState* network = |
347 network_state_handler_->GetFavoriteState(service_path); | 347 network_state_handler_->GetFavoriteStateFromServicePath( |
| 348 service_path, true /* configured_only */); |
348 if (!network) { | 349 if (!network) { |
349 LOG(ERROR) << "service path '" << service_path << "' unknown."; | 350 LOG(ERROR) << "service path '" << service_path << "' unknown."; |
350 return; | 351 return; |
351 } | 352 } |
352 FavoriteStateList networks; | 353 FavoriteStateList networks; |
353 networks.push_back(network); | 354 networks.push_back(network); |
354 ResolveNetworks(networks); | 355 ResolveNetworks(networks); |
355 } | 356 } |
356 | 357 |
357 void ClientCertResolver::ResolveNetworks(const FavoriteStateList& networks) { | 358 void ClientCertResolver::ResolveNetworks(const FavoriteStateList& networks) { |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 DBusThreadManager::Get()->GetShillServiceClient()-> | 446 DBusThreadManager::Get()->GetShillServiceClient()-> |
446 SetProperties(dbus::ObjectPath(it->service_path), | 447 SetProperties(dbus::ObjectPath(it->service_path), |
447 shill_properties, | 448 shill_properties, |
448 base::Bind(&base::DoNothing), | 449 base::Bind(&base::DoNothing), |
449 base::Bind(&LogError, it->service_path)); | 450 base::Bind(&LogError, it->service_path)); |
450 network_state_handler_->RequestUpdateForNetwork(it->service_path); | 451 network_state_handler_->RequestUpdateForNetwork(it->service_path); |
451 } | 452 } |
452 } | 453 } |
453 | 454 |
454 } // namespace chromeos | 455 } // namespace chromeos |
OLD | NEW |