From 82055599593e05cb3a994002d3d2556749e6c693 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Tue, 29 Dec 2020 09:48:01 +0000
Subject: [PATCH] Fix regressions in auth modules

---
 sesman/Makefile.am                | 8 ++++----
 sesman/verify_user.c              | 1 +
 sesman/verify_user_kerberos.c     | 1 +
 sesman/verify_user_pam_userpass.c | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 50425e63..78e00416 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -15,10 +15,6 @@ if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
 endif
 
-if SESMAN_NOPAM
-AUTH_C = verify_user.c
-AUTH_LIB = -lcrypt
-else
 if SESMAN_BSD
 AUTH_C = verify_user_bsd.c
 AUTH_LIB =
@@ -31,6 +27,10 @@ if SESMAN_KERBEROS
 AUTH_C = verify_user_kerberos.c
 AUTH_LIB = -lkrb5
 else
+if SESMAN_NOPAM
+AUTH_C = verify_user.c
+AUTH_LIB = -lcrypt
+else
 AUTH_C = verify_user_pam.c
 AUTH_LIB = -lpam
 endif
diff --git a/sesman/verify_user.c b/sesman/verify_user.c
index 175463ea..76918d68 100644
--- a/sesman/verify_user.c
+++ b/sesman/verify_user.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "sesman.h"
+#include "string_calls.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/sesman/verify_user_kerberos.c b/sesman/verify_user_kerberos.c
index bf011506..6ddc6a80 100644
--- a/sesman/verify_user_kerberos.c
+++ b/sesman/verify_user_kerberos.c
@@ -30,6 +30,7 @@
 
 #include "arch.h"
 #include "os_calls.h"
+#include "string_calls.h"
 
 #include <krb5.h>
 
diff --git a/sesman/verify_user_pam_userpass.c b/sesman/verify_user_pam_userpass.c
index fc872778..ac5981f4 100644
--- a/sesman/verify_user_pam_userpass.c
+++ b/sesman/verify_user_pam_userpass.c
@@ -30,6 +30,7 @@
 
 #include "arch.h"
 #include "os_calls.h"
+#include "string_calls.h"
 
 #include <security/pam_userpass.h>