diff options
author | des <des@FreeBSD.org> | 2001-11-27 15:36:21 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2001-11-27 15:36:21 +0000 |
commit | 267da2315e945a24680e2b7a467ce902bf5d5f57 (patch) | |
tree | f48fc6e4e7268cea75e01a41bcfba54734dc30dd /contrib | |
parent | c5700fd96e52df0979f14a2418ef0e6ceee10e9a (diff) | |
download | FreeBSD-src-267da2315e945a24680e2b7a467ce902bf5d5f57.zip FreeBSD-src-267da2315e945a24680e2b7a467ce902bf5d5f57.tar.gz |
Due to incorrect include ordering, <dlfcn.h> did not get included, so
RTLD_NOW got incorrectly defined to 1 (which is RTLD_LAZY in FreeBSD).
In addition, the comment about FreeBSD requiring SHLIB_SYM_PREFIX to
be "_" is incorrect.
Submitted by: tobez (except for the bit about the incorrect comment)
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/libpam/libpam/pam_handlers.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/contrib/libpam/libpam/pam_handlers.c b/contrib/libpam/libpam/pam_handlers.c index 7ae7174..4b37d3d 100644 --- a/contrib/libpam/libpam/pam_handlers.c +++ b/contrib/libpam/libpam/pam_handlers.c @@ -5,6 +5,7 @@ * Currently maintained by Andrew G. Morgan <morgan@linux.kernel.org> * * $Id: pam_handlers.c,v 1.3 2001/02/05 06:50:41 agmorgan Exp $ + * $FreeBSD$ * */ @@ -13,6 +14,11 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> + +#include "pam_private.h" + #ifdef PAM_DYNAMIC # ifdef PAM_SHL # include <dl.h> @@ -20,17 +26,8 @@ # include <dlfcn.h> # endif /* PAM_SHL */ #endif /* PAM_DYNAMIC */ -#include <fcntl.h> -#include <unistd.h> - -#include "pam_private.h" - -/* FreeBSD doesn't define this */ -#ifndef RTLD_NOW -# define RTLD_NOW 1 -#endif -/* If not required, define as nothing - FreeBSD needs it to be "_"... */ +/* If not required, define as nothing */ #ifndef SHLIB_SYM_PREFIX # define SHLIB_SYM_PREFIX "" #endif |