[ 3022934 ] SLP code calls setupControl more than once

zaneb · Jun 29, 2010 · 417d1c1 · 417d1c1
1 parent 2800ba8
commit 417d1c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,9 @@
 	* cimslp.c, cimslpSLP.c:
 	[ 3022941 ] Remove HAVE_SLP_ALONE sections
 
+	* profileProvider.c, cimslpCMPI.c:
+	[ 3022934 ] SLP code calls setupControl more than once
+
 2010-06-17  Chris Buccella  <buccella@linux.vnet.ibm.com>
 
 	* providerDrv.c:

diff --git a/NEWS b/NEWS
@@ -10,6 +10,7 @@ Bugs fixed:
 - 2950521 Provider operations are wrongly traced
 - 3016863 Data corruption when replacing array properties
 - 3022941 Remove HAVE_SLP_ALONE sections
+- 3022934 SLP code calls setupControl more than once
 
 Changes in 1.3.8
 ================

diff --git a/cimslpCMPI.c b/cimslpCMPI.c
@@ -275,7 +275,6 @@ getSLPData(cimomConfig cfg, const CMPIBroker *_broker,
   int             err;
 
   err = 1;
-  setupControl(configfile);
   if (getControlChars("slpHostnamelib", &ln) == 0) {
     libraryName(NULL, ln, dlName, 512);
     if ((hostnameLib = dlopen(dlName, RTLD_LAZY))) {
@@ -284,7 +283,6 @@ getSLPData(cimomConfig cfg, const CMPIBroker *_broker,
         err = 0;
     }
   }
-  sunsetControl();
   if (err)
     mlogf(M_ERROR, M_SHOW,
           "--- SLP Hostname exit %s not found. Defaulting to system hostname.\n",

diff --git a/profileProvider.c b/profileProvider.c
@@ -328,7 +328,6 @@ updateSLPReg(const CMPIContext *ctx, int slpLifeTime)
   _SFCB_ENTER(TRACE_SLP, "updateSLPReg");
 
   pthread_mutex_lock(&slpUpdateMtx);
-  setupControl(configfile);
 
   getControlBool("enableSlp", &enableSlp);
   if(!enableSlp) {
@@ -440,6 +439,7 @@ slpUpdate(void *args)
             timeLeft, slp_shutting_down ? "true" : "false"));
   }
   //End loop
+  sunsetControl();
   if(http_url) {
     _SFCB_TRACE(2, ("--- Deregistering http advertisement"));
     deregisterCIMService(http_url);