(file) Return to Executor.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Executor.cpp between version 1.26 and 1.27

version 1.26, 2012/12/13 14:38:55 version 1.27, 2013/02/22 00:17:18
Line 502 
Line 502 
         readPipe = new AnonymousPipe(readFdStr, 0);         readPipe = new AnonymousPipe(readFdStr, 0);
         writePipe = new AnonymousPipe(0, writeFdStr);         writePipe = new AnonymousPipe(0, writeFdStr);
  
 #  if defined(PEGASUS_HAS_SIGNALS)  #  if defined(PEGASUS_HAS_SIGNALS) && \
 #   if !defined(PEGASUS_DISABLE_PROV_USERCTXT) && !defined(PEGASUS_OS_ZOS)        !(defined(PEGASUS_DISABLE_PROV_USERCTXT) || defined(PEGASUS_OS_ZOS))
         // The cimprovagt forks and returns right away.  Clean up the zombie         // The cimprovagt forks and returns right away.  Clean up the zombie
         // process now instead of in reapProviderAgent().         // process now instead of in reapProviderAgent().
         int status = 0;         int status = 0;
         while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)         while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)
             ;             ;
 #   endif #   endif
 #  endif  
  
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return 0;         return 0;
Line 539 
Line 538 
         return -1;         return -1;
     }     }
 #else  /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION is NOT defined */ #else  /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION is NOT defined */
 # if defined(PEGASUS_HAS_SIGNALS)  # if defined(PEGASUS_HAS_SIGNALS) && \
 #  if defined(PEGASUS_DISABLE_PROV_USERCTXT) || defined(PEGASUS_OS_ZOS)       (defined(PEGASUS_DISABLE_PROV_USERCTXT) || defined(PEGASUS_OS_ZOS))
     virtual int reapProviderAgent(int pid)     virtual int reapProviderAgent(int pid)
     {     {
         int status = 0;         int status = 0;
Line 558 
Line 557 
     }     }
 #  endif #  endif
 # endif # endif
 #endif  
  
  
 #if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)


Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2