summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorHelper.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-05-15 13:50:06 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-05-15 13:50:06 +0000
commit7e10a829d27a276d4198caea277f76e1b7687d46 (patch)
tree72dfc9dfc688647a98c2f004a62801f3d31516ba /cpp/src/IceGrid/DescriptorHelper.cpp
parentpass communicator to CallbackSenderI (diff)
downloadice-7e10a829d27a276d4198caea277f76e1b7687d46.tar.bz2
ice-7e10a829d27a276d4198caea277f76e1b7687d46.tar.xz
ice-7e10a829d27a276d4198caea277f76e1b7687d46.zip
Added support for changing owner of server files/directories.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 89ee8a55c10..c83e69d0009 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1073,7 +1073,10 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance,
instance->allocatable = _desc->allocatable;
instance->user = resolve(_desc->user, "user");
if(!instance->activation.empty() &&
- instance->activation != "manual" && instance->activation != "on-demand" && instance->activation != "always")
+ instance->activation != "manual" &&
+ instance->activation != "on-demand" &&
+ instance->activation != "always" &&
+ instance->activation != "session")
{
resolve.exception("unknown activation `" + instance->activation + "'");
}