merge in oc-release history after reset to master
diff --git a/dbus/authpolicy/dbus-constants.h b/dbus/authpolicy/dbus-constants.h
index 0553b2a..1d5fa8e 100644
--- a/dbus/authpolicy/dbus-constants.h
+++ b/dbus/authpolicy/dbus-constants.h
@@ -67,6 +67,12 @@
ERROR_USER_HIT_JOIN_QUOTA = 22,
// Kinit or smbclient failed to contact Key Distribution Center.
ERROR_CONTACTING_KDC_FAILED = 23,
+ // Kerberos credentials cache not found.
+ ERROR_NO_CREDENTIALS_CACHE_FOUND = 24,
+ // Kerberos ticket expired while renewing credentials.
+ ERROR_KERBEROS_TICKET_EXPIRED = 25,
+ // klist exited with unspecified error.
+ ERROR_KLIST_FAILED = 26,
// Should be the last.
ERROR_COUNT,
};
diff --git a/dbus/cryptohome/rpc.proto b/dbus/cryptohome/rpc.proto
index ae4a0f0..be72ce1 100644
--- a/dbus/cryptohome/rpc.proto
+++ b/dbus/cryptohome/rpc.proto
@@ -131,6 +131,8 @@
// Setting this value means that the KeyData is filled as it
// would be with a Key above or in an AddKeyRequest.
optional bool copy_authorization_key = 2 [default=false];
+ // If set to true, always use eCryptfs as the encryption method.
+ optional bool force_ecryptfs = 3 [default=false];
// In the future, this will contain account-wide data like
// the deletion priority or the IdP's origin.
}
diff --git a/dbus/service_constants.h b/dbus/service_constants.h
index 86d6b0a..8eb2602 100644
--- a/dbus/service_constants.h
+++ b/dbus/service_constants.h
@@ -110,13 +110,26 @@
DISPLAY_POWER_INTERNAL_ON_EXTERNAL_OFF = 3,
};
+const char kNetworkProxyServiceName[] = "org.chromium.NetworkProxyService";
+const char kNetworkProxyServicePath[] = "/org/chromium/NetworkProxyService";
+const char kNetworkProxyServiceInterface[] =
+ "org.chromium.NetworkProxyServiceInterface";
+const char kNetworkProxyServiceResolveProxyMethod[] = "ResolveProxy";
+
const char kLivenessServiceName[] = "org.chromium.LivenessService";
const char kLivenessServicePath[] = "/org/chromium/LivenessService";
const char kLivenessServiceInterface[] =
"org.chromium.LivenessServiceInterface";
-// Methods
const char kLivenessServiceCheckLivenessMethod[] = "CheckLiveness";
+const char kKioskAppServiceName[] = "org.chromium.KioskAppService";
+const char kKioskAppServicePath[] = "/org/chromium/KioskAppService";
+const char kKioskAppServiceInterface[] =
+ "org.chromium.KioskAppServiceInterface";
+// Methods
+const char kKioskAppServiceGetRequiredPlatformVersionMethod[] =
+ "GetRequiredPlatformVersion";
+
} // namespace chromeos
namespace cromo {
