debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtlogin: get rid of some warnings.

Browse Source
This commit is contained in:
Liang Chang
2021-01-31 01:56:14 +08:00
committed by Jon Trulson
parent fa2f6a39cc
commit 085c8bdc37
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtlogin/Imakefile
View File

@@ -130,7 +130,7 @@ DEPXAUTHLIB =
DEPXDMCPLIB = DEPXDMCPLIB =
#endif #endif
#ifdef HasPamLibrary #if defined(HasPamLibrary) && HasPamLibrary
DTPAMSVCLIB = -lDtPamSvc DTPAMSVCLIB = -lDtPamSvc
EXTRA_DEFINES += -DHAS_PAM_LIBRARY EXTRA_DEFINES += -DHAS_PAM_LIBRARY
#else #else

4
cde/programs/dtlogin/config/Imakefile
View File

@@ -26,7 +26,7 @@ LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
LOCAL_CPP_DEFINES += -DFREEBSD LOCAL_CPP_DEFINES += -DFREEBSD
#endif #endif
#ifdef HasPamLibrary #if defined(HasPamLibrary) && HasPamLibrary
LOCAL_CPP_DEFINES += -DHAS_PAM_LIBRARY LOCAL_CPP_DEFINES += -DHAS_PAM_LIBRARY
#ifdef PamAuthenticationModule #ifdef PamAuthenticationModule
PAM_AUTHENTICATION_MODULE=PamAuthenticationModule PAM_AUTHENTICATION_MODULE=PamAuthenticationModule
@@ -91,6 +91,6 @@ CppSourceFile(dtlslocale,dtlslocale.src,$(LOCAL_CPP_DEFINES),)
CppSourceFile(dtprofile,dtprofile.src,$(LOCAL_CPP_DEFINES),) CppSourceFile(dtprofile,dtprofile.src,$(LOCAL_CPP_DEFINES),)
CppSourceFile(home.session,home.session.src,$(LOCAL_CPP_DEFINES),) CppSourceFile(home.session,home.session.src,$(LOCAL_CPP_DEFINES),)
#ifdef HasPamLibrary #if defined(HasPamLibrary) && HasPamLibrary
CppSourceFile(dtlogin.pam.conf,dtlogin.pam.conf.src,$(LOCAL_CPP_DEFINES),) CppSourceFile(dtlogin.pam.conf,dtlogin.pam.conf.src,$(LOCAL_CPP_DEFINES),)
#endif #endif

8
cde/programs/dtlogin/session.c
View File

@@ -105,6 +105,10 @@
#include "rgy_base.h" #include "rgy_base.h"
#endif #endif
#ifdef HAS_PAM_LIBRARY
#include <PamSvc.h>
#endif
#ifdef SIA #ifdef SIA
static SIAENTITY *siaHandle = NULL; static SIAENTITY *siaHandle = NULL;
@@ -313,7 +317,7 @@ SessionPingFailed( struct display *d )
#endif #endif
#if !defined(sun) && defined(HAS_PAM_LIBRARY) #if !defined(sun) && defined(HAS_PAM_LIBRARY)
Account(d, user, NULL, clientPid, DEAD_PROCESS, NULL); Account(d, user, NULL, clientPid, DEAD_PROCESS, 0);
#endif #endif
} }
SessionExit (d, RESERVER_DISPLAY); SessionExit (d, RESERVER_DISPLAY);
@@ -638,7 +642,7 @@ ManageSession( struct display *d )
#endif #endif
#if !defined(sun) && defined(HAS_PAM_LIBRARY) #if !defined(sun) && defined(HAS_PAM_LIBRARY)
Account(d, user, NULL, clientPid, DEAD_PROCESS, NULL); Account(d, user, NULL, clientPid, DEAD_PROCESS, 0);
#endif #endif
SessionExit (d, OBEYSESS_DISPLAY); SessionExit (d, OBEYSESS_DISPLAY);