diff options
| -rw-r--r-- | config.h.in | 27 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | sftp_server/userauth.c | 11 |
4 files changed, 29 insertions, 15 deletions
diff --git a/config.h.in b/config.h.in index cc221245..6abb2cb4 100644 --- a/config.h.in +++ b/config.h.in @@ -1,10 +1,11 @@ /* config.h.in. Generated from configure.in by autoheader. */ +/* Define to 1 if you have the `cfmakeraw' function. */ +#undef HAVE_CFMAKERAW + /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT -#undef HAVE_CFMAKERAW - /* Define to 1 if you have the `endpwent' function. */ #undef HAVE_ENDPWENT @@ -26,12 +27,6 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO -/* Define to 1 if you have the `nsl' library (-lnsl). */ -#undef HAVE_LIBNSL - -/* Define to 1 if you have the `resolv' library (-lresolv). */ -#undef HAVE_LIBRESOLV - /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ @@ -60,19 +55,31 @@ /* Define to 1 if you have the <openssl/blowfish.h> header file. */ #undef HAVE_OPENSSL_BLOWFISH_H +/* Define to 1 if you have the <pam/pam_appl.h> header file. */ +#undef HAVE_PAM_PAM_APPL_H + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL +/* Define to 1 if you have the <pty.h> header file. */ +#undef HAVE_PTY_H + /* Define to 1 if your system has a GNU libc compatible `realloc' function, and to 0 otherwise. */ #undef HAVE_REALLOC +/* Define to 1 if you have the <security/pam_appl.h> header file. */ +#undef HAVE_SECURITY_PAM_APPL_H + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT /* Define to 1 if you have the `socket' function. */ #undef HAVE_SOCKET +/* Define to 1 if you want to enable SSH1 */ +#undef HAVE_SSH1 + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -172,7 +179,3 @@ /* Define to rpl_realloc if the replacement function should be used. */ #undef realloc - -#undef HAVE_SSH1 -#undef HAVE_PTY_H -#undef HAVE_STDINT_H @@ -3691,9 +3691,11 @@ done + + for ac_header in fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h \ sys/time.h termios.h unistd.h openssl/aes.h openssl/blowfish.h zlib.h \ -sys/poll.h stdint.h pty.h +sys/poll.h stdint.h pty.h pam/pam_appl.h security/pam_appl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/configure.in b/configure.in index 7f829915..65f356a7 100644 --- a/configure.in +++ b/configure.in @@ -47,7 +47,7 @@ AC_SEARCH_LIBS([gethostbyname],[nsl resolv]) AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h \ sys/time.h termios.h unistd.h openssl/aes.h openssl/blowfish.h zlib.h \ -sys/poll.h stdint.h pty.h]) +sys/poll.h stdint.h pty.h pam/pam_appl.h security/pam_appl.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/sftp_server/userauth.c b/sftp_server/userauth.c index b5a6055d..892b485e 100644 --- a/sftp_server/userauth.c +++ b/sftp_server/userauth.c @@ -23,7 +23,16 @@ MA 02111-1307, USA. */ #include <libssh/libssh.h> #include <libssh/server.h> //#include <libssh/sftp.h> -#include <security/pam_appl.h> +#ifdef HAVE_SECURITY_PAM_APPL_H + #include <security/pam_appl.h> +#else + #ifdef HAVE_PAM_PAM_APPL_H + #include <pam/pam_appl.h> + #else + #error your system has'nt PAM development files installed + #endif +#endif + #include <pwd.h> #include <errno.h> #include <string.h> |