Automate load of CryptPermissionsVerifier plug-in

13 files changed, 20 insertions, 29 deletions

diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index 19bfb55fe9a..41cfb3ac1ef 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -535,6 +535,15 @@ RouterService::initializeCommunicator(int& argc, char* argv[],
 {
     InitializationData initData = initializationData;
     initData.properties = createProperties(argc, argv, initializationData.properties);
+    
+    //
+    // If Glacier2.CryptPasswords is set configure the CryptPermissionsVerifier plug-in
+    //
+    if(!initData.properties->getProperty("Glacier2.CryptPasswords").empty())
+    {
+        initData.properties->setProperty("Ice.Plugin.CryptPermissionsVerifier",
+                                         "CryptPermissionsVerifier:createCryptPermissionsVerifier");
+    }
  
     //
     // Make sure that Glacier2 doesn't use a router.
diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile
index 111e0c2335b..9d34515b9a1 100644
--- a/cpp/src/Glacier2/Makefile
+++ b/cpp/src/Glacier2/Makefile
@@ -45,16 +45,4 @@ install:: all
 	$(call installprogram,$(ROUTER),$(DESTDIR)$(install_bindir))
 	$(call installdata,$(top_srcdir)/../man/man1/glacier2router.1,$(DESTDIR)$(install_mandir))
 
-SUBDIRS = CryptPermissionsVerifier
-
-$(EVERYTHING)::
-	@for subdir in $(SUBDIRS); \
-	do \
-	    if test -d $$subdir ; \
-	    then \
-		echo "making $@ in $$subdir"; \
-		( cd $$subdir && $(MAKE) $@ ) || exit 1; \
-	    fi; \
-	done
-
 include .depend
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak
index e14a1d9a9d1..f89f7360abc 100644
--- a/cpp/src/Glacier2/Makefile.mak
+++ b/cpp/src/Glacier2/Makefile.mak
@@ -63,12 +63,4 @@ install:: all
 
 !endif
 
-SUBDIRS = CryptPermissionsVerifier
-
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @if exist %i \
-	        @echo "making $@ in %i" && \
-	        cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
-
 !include .depend.mak
diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp
index ff9f871b730..9659f075ed1 100644
--- a/cpp/src/IceGrid/IceGridRegistry.cpp
+++ b/cpp/src/IceGrid/IceGridRegistry.cpp
@@ -165,6 +165,17 @@ RegistryService::initializeCommunicator(int& argc, char* argv[],
     initData.properties = createProperties(argc, argv, initData.properties);
     
     //
+    // If IceGrid.CryptPasswords or IceGrid.AdminCryptPasswords are set configure the 
+    // CryptPermissionsVerifier plug-in
+    //
+    if(!initData.properties->getProperty("IceGrid.CryptPasswords").empty() ||
+       !initData.properties->getProperty("IceGrid.AdminCryptPasswords").empty())
+    {
+        initData.properties->setProperty("Ice.Plugin.CryptPermissionsVerifier",
+                                         "CryptPermissionsVerifier:createCryptPermissionsVerifier");
+    }
+    
+    //
     // Setup the client thread pool size.
     //
     setupThreadPool(initData.properties, "Ice.ThreadPool.Client", 1, 100);
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py
index dec8970e423..74e074ee2a1 100755
--- a/cpp/test/Glacier2/attack/run.py
+++ b/cpp/test/Glacier2/attack/run.py
@@ -30,7 +30,6 @@ args = ' --Glacier2.RoutingTable.MaxSize=10' + \
        ' --Glacier2.Client.Endpoints="default -p 12347"' + \
        ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
        ' --Ice.Admin.InstanceName=Glacier2' + \
-       ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
        ' --Glacier2.CryptPasswords="' + os.path.join(testdir, "passwords")  + '"'
 
 sys.stdout.write("starting router... ")
diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py
index 8028e6ce666..17fb75f3098 100755
--- a/cpp/test/Glacier2/router/run.py
+++ b/cpp/test/Glacier2/router/run.py
@@ -36,7 +36,6 @@ def startRouter(buffered):
            ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
            ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
            ' --Ice.Admin.InstanceName="Glacier2"' + \
-           ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
            ' --Glacier2.CryptPasswords="%s"' % os.path.join(os.getcwd(), "passwords")
 
     if buffered:
diff --git a/cpp/test/Glacier2/sessionHelper/run.py b/cpp/test/Glacier2/sessionHelper/run.py
index 50c7fef6fcf..0e234083923 100755
--- a/cpp/test/Glacier2/sessionHelper/run.py
+++ b/cpp/test/Glacier2/sessionHelper/run.py
@@ -29,7 +29,6 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Glacier2.Server.Endpoints="default -h 127.0.0.1"' \
         ' --Ice.Admin.Endpoints="default -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
-        ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
 sys.stdout.write("starting router... ")
diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py
index a79cbec8f9d..f1b459a7863 100755
--- a/cpp/test/Glacier2/staticFiltering/run.py
+++ b/cpp/test/Glacier2/staticFiltering/run.py
@@ -283,7 +283,6 @@ for testcase in testcases:
           ' --Glacier2.Client.Endpoints="default -p 12347"' + \
           ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
           ' --Ice.Admin.InstanceName=Glacier2' + \
-          ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
           ' --Glacier2.CryptPasswords="'  + os.path.join(os.getcwd(), "passwords") + '"'
 
     routerConfig = open(os.path.join(os.getcwd(), "router.cfg"), "w")
diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py
index 7e44561ee86..49cf68f027a 100755
--- a/cs/test/Glacier2/router/run.py
+++ b/cs/test/Glacier2/router/run.py
@@ -31,7 +31,6 @@ args = ' --Ice.Warn.Dispatch=0' + \
        ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
        ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
        ' --Ice.Admin.InstanceName=Glacier2' + \
-       ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
        ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
 sys.stdout.write("starting router... ")
diff --git a/cs/test/Glacier2/sessionHelper/run.py b/cs/test/Glacier2/sessionHelper/run.py
index e973d8db47f..f6e9c94d370 100755
--- a/cs/test/Glacier2/sessionHelper/run.py
+++ b/cs/test/Glacier2/sessionHelper/run.py
@@ -29,7 +29,6 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
         ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
-        ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
 sys.stdout.write("starting router... ")
diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py
index a2688afe63f..68f88d7ef33 100755
--- a/java/test/Glacier2/router/run.py
+++ b/java/test/Glacier2/router/run.py
@@ -31,7 +31,6 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
         ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
-        ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
 sys.stdout.write("starting router... ")
diff --git a/java/test/Glacier2/sessionHelper/run.py b/java/test/Glacier2/sessionHelper/run.py
index e973d8db47f..f6e9c94d370 100755
--- a/java/test/Glacier2/sessionHelper/run.py
+++ b/java/test/Glacier2/sessionHelper/run.py
@@ -29,7 +29,6 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
         ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
-        ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
 sys.stdout.write("starting router... ")
diff --git a/js/test/Glacier2/router/run.py b/js/test/Glacier2/router/run.py
index 185097f871f..04f4d7f5287 100755
--- a/js/test/Glacier2/router/run.py
+++ b/js/test/Glacier2/router/run.py
@@ -31,7 +31,6 @@ args =  ' --Ice.Warn.Dispatch=0' + \
         ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \
         ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \
         ' --Ice.Admin.InstanceName=Glacier2' + \
-        ' --Ice.Plugin.CryptPermissionsVerifier=CryptPermissionsVerifier:createCryptPermissionsVerifier' + \
         ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
 
 sys.stdout.write("starting router... ")