libopenbsd: clean up readpassphrase compat and fix ifdefs

[opendoas.git] / pam.c

diff --git a/pam.c b/pam.c
index ccebd0fe98105499e81555bd5d15b3335cec3258..b921069b195a8a4d89b714f07d264bcc50cfb4d5 100644 (file)
--- a/pam.c
+++ b/pam.c
@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -21,10 +23,10 @@
 #include <errno.h>
 #include <limits.h>
 #include <pwd.h>
-#ifdef HAVE_READPASSPHRASE_H
+#ifdef HAVE_READPASSPHRASE
 #      include <readpassphrase.h>
 #else
-#      include "readpassphrase.h"
+#      include "sys-readpassphrase.h"
 #endif
 #include <signal.h>
 #include <stdio.h>
@@ -37,6 +39,10 @@
 
 #include "includes.h"
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
+#endif
+
 #define PAM_SERVICE_NAME "doas"
 
 static pam_handle_t *pamh = NULL;
@@ -271,9 +277,6 @@ pamauth(const char *user, const char *myname, int interactive, int nopass, int p
                if (!interactive)
                        errx(1, "Authorization required");
 
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
-#endif
                /* doas style prompt for pam */
                char host[HOST_NAME_MAX + 1];
                if (gethostname(host, sizeof(host)))