Automate load of CryptPermissionsVerifier plug-in

4 files changed, 20 insertions, 20 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);