jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1769 from matt335672/issue1768

Browse Source 
Fix regressions in auth modules
This commit is contained in:
matt335672 2020-12-29 10:44:10 +00:00 committed by GitHub
commit d8998a0a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sesman/Makefile.am
View File

@ -15,10 +15,6 @@ if XRDP_DEBUG
AM_CPPFLAGS += -DXRDP_DEBUG AM_CPPFLAGS += -DXRDP_DEBUG
endif endif
if SESMAN_NOPAM
AUTH_C = verify_user.c
AUTH_LIB = -lcrypt
else
if SESMAN_BSD if SESMAN_BSD
AUTH_C = verify_user_bsd.c AUTH_C = verify_user_bsd.c
AUTH_LIB = AUTH_LIB =
@ -31,6 +27,10 @@ if SESMAN_KERBEROS
AUTH_C = verify_user_kerberos.c AUTH_C = verify_user_kerberos.c
AUTH_LIB = -lkrb5 AUTH_LIB = -lkrb5
else else
if SESMAN_NOPAM
AUTH_C = verify_user.c
AUTH_LIB = -lcrypt
else
AUTH_C = verify_user_pam.c AUTH_C = verify_user_pam.c
AUTH_LIB = -lpam AUTH_LIB = -lpam
endif endif

1
sesman/verify_user.c
View File

@ -29,6 +29,7 @@
#endif #endif
#include "sesman.h" #include "sesman.h"
#include "string_calls.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

1
sesman/verify_user_kerberos.c
View File

@ -30,6 +30,7 @@
#include "arch.h" #include "arch.h"
#include "os_calls.h" #include "os_calls.h"
#include "string_calls.h"
#include <krb5.h> #include <krb5.h>

1
sesman/verify_user_pam_userpass.c
View File

@ -30,6 +30,7 @@
#include "arch.h" #include "arch.h"
#include "os_calls.h" #include "os_calls.h"
#include "string_calls.h"
#include <security/pam_userpass.h> #include <security/pam_userpass.h>