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

Diff for /pegasus/src/Executor/Parent.c between version 1.22 and 1.23

version 1.22, 2013/01/22 08:56:24 version 1.23, 2013/06/05 14:09:24
Line 58 
Line 58 
  
 #if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
 # include "PAMAuth.h" # include "PAMAuth.h"
   #else
   /* PAM_SUCCESS is defined to 0 by PAM */
   #define PAM_SUCCESS 0
 #endif #endif
  
 /* /*
Line 631 
Line 634 
  
 #if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
  
         if (PAMAuthenticate(request.username, request.password) != 0)          status = PAMAuthenticate(request.username, request.password);
   
           if (status == PAM_SUCCESS)
         {         {
             status = -1;              Log(LL_TRACE,
             break;                  "Basic authentication through PAM: "
                       "username = %s, successful.",
                   request.username);
           }
           else
           {
               Log(LL_TRACE,
                   "Basic authentication through PAM: "
                       "username = %s, failed with PAM return code= %d.",
                   request.username,
                   status);
         }         }
   
  
 #else /* !PEGASUS_PAM_AUTHENTICATION */ #else /* !PEGASUS_PAM_AUTHENTICATION */
  
Line 665 
Line 679 
             }             }
         }         }
  
           Log(LL_TRACE, "Basic authentication attempt: username = %s, "
               "successful = %s",
               request.username, status == PAM_SUCCESS ? "TRUE" : "FALSE" );
   
 #endif /* !PEGASUS_PAM_AUTHENTICATION */ #endif /* !PEGASUS_PAM_AUTHENTICATION */
     }     }
     while (0);     while (0);
  
     Log(LL_TRACE, "Basic authentication attempt: username = %s, "  
         "successful = %s",  
         request.username, status == 0 ? "TRUE" : "FALSE" );  
   
     /* Send response message. */     /* Send response message. */
  
     response.status = status;     response.status = status;
Line 711 
Line 725 
  
 #if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
  
     if (PAMValidateUser(request.username) != 0)      status = PAMValidateUser(request.username);
         status = -1;  
  
 #else /* !PEGASUS_PAM_AUTHENTICATION */ #else /* !PEGASUS_PAM_AUTHENTICATION */
  

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2