diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-08-29 11:24:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-08-29 11:24:49 -0400 |
| commit | 33702f21d02bd543f365e4db6e118ba5257c109b (patch) | |
| tree | 5ee69df98dcb14ba47d60e727c59f6f1018692a5 /cpp/src/Ice/PropertyNames.cpp | |
| parent | Minor fix for JS OutgoingConnectionFactory (diff) | |
| download | ice-33702f21d02bd543f365e4db6e118ba5257c109b.tar.bz2 ice-33702f21d02bd543f365e4db6e118ba5257c109b.tar.xz ice-33702f21d02bd543f365e4db6e118ba5257c109b.zip | |
New fix for ICE-5637: Glacier2CryptPermissionsVerifier plugin + Glacier2Internal::setupNullPermissionsVerifier function
Diffstat (limited to 'cpp/src/Ice/PropertyNames.cpp')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 4f42559437a..01a2761c583 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Aug 18 23:51:46 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Aug 29 11:20:17 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1114,6 +1114,7 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.Client.Trace.Override", false, 0), IceInternal::Property("Glacier2.Client.Trace.Reject", false, 0), IceInternal::Property("Glacier2.Client.Trace.Request", false, 0), + IceInternal::Property("Glacier2.CryptPasswords", false, 0), IceInternal::Property("Glacier2.Filter.Address.Reject", false, 0), IceInternal::Property("Glacier2.Filter.Address.Accept", false, 0), IceInternal::Property("Glacier2.Filter.ProxySizeMax", false, 0), @@ -1121,7 +1122,6 @@ const IceInternal::Property Glacier2PropsData[] = IceInternal::Property("Glacier2.Filter.Category.AcceptUser", false, 0), IceInternal::Property("Glacier2.Filter.AdapterId.Accept", false, 0), IceInternal::Property("Glacier2.Filter.Identity.Accept", false, 0), - IceInternal::Property("Glacier2.CryptPasswords", false, 0), IceInternal::Property("Glacier2.InstanceName", false, 0), IceInternal::Property("Glacier2.PermissionsVerifier.EndpointSelection", false, 0), IceInternal::Property("Glacier2.PermissionsVerifier.ConnectionCached", false, 0), @@ -1216,6 +1216,16 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::Glacier2Props(Glacier2PropsData, sizeof(Glacier2PropsData)/sizeof(Glacier2PropsData[0])); +const IceInternal::Property Glacier2CryptPermissionsVerifierPropsData[] = +{ + IceInternal::Property("Glacier2CryptPermissionsVerifier.*.PermissionsVerifier", false, 0), + IceInternal::Property("Glacier2CryptPermissionsVerifier.*.AdminPermissionsVerifier", false, 0), +}; + +const IceInternal::PropertyArray + IceInternal::PropertyNames::Glacier2CryptPermissionsVerifierProps(Glacier2CryptPermissionsVerifierPropsData, + sizeof(Glacier2CryptPermissionsVerifierPropsData)/sizeof(Glacier2CryptPermissionsVerifierPropsData[0])); + const IceInternal::Property FreezePropsData[] = { IceInternal::Property("Freeze.DbEnv.*.CheckpointPeriod", false, 0), @@ -1266,6 +1276,7 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] = IceSSLProps, IceStormAdminProps, Glacier2Props, + Glacier2CryptPermissionsVerifierProps, FreezeProps, IceInternal::PropertyArray(0,0) }; @@ -1286,6 +1297,7 @@ const char* IceInternal::PropertyNames::clPropNames[] = "IceSSL", "IceStormAdmin", "Glacier2", + "Glacier2CryptPermissionsVerifier", "Freeze", 0 }; |