summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew G. Morgan <morgan@kernel.org>2001-12-11 07:41:39 +0000
committerAndrew G. Morgan <morgan@kernel.org>2001-12-11 07:41:39 +0000
commit3d9d57f071a69c10b618270f50a36ff810725c94 (patch)
treef359a6009ee87b4850b85658e76b71767d33c0cb
parent2acda542874f720091f6bfcb7aad09e35a8b2375 (diff)
Relevant BUGIDs: 486063
Purpose of commit: compatibility Commit summary: --------------- A BSD fix from Dag-Erling Smørgrav and Anton Berezin. What was there before did not correctly deal with BSD dynamic linking.
-rw-r--r--CHANGELOG5
-rw-r--r--libpam/pam_handlers.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f9bb5f80..a2c050ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -55,6 +55,8 @@ bug report - outstanding bugs are listed here:
0.76: please submit patches for this section with actual code/doc
patches!
+* pam_handlers: BSD fix from Dag-Erling Smørgrav and Anton Berezin
+ (Bug 486063 - agmorgan)
* added the dynamic/* directory to the distribution. If you go in
there after building the rest of the tree, you'll make a pam.so
object that can be used by something like a java runtime with
@@ -65,7 +67,8 @@ bug report - outstanding bugs are listed here:
486361 - agmorgan).
* added a static module helper library object includes a few changes
to examples/xsh.c for testing purposes, and also modified the
- pam_rhosts_auth module to use this new library. (Bug 490938 - agmorgan)
+ pam_rhosts_auth module to use this new library. (Bug 490938,
+ 409852 - agmorgan)
* documentation: random typo fixes from Nalin and more stuff from me
(Bug 476949, Tasks 43507, 17426 - agmorgan)
* pam_unix: fix 'likeauth' to kill off the memory leak once and for all.
diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c
index d007ed98..62b7446c 100644
--- a/libpam/pam_handlers.c
+++ b/libpam/pam_handlers.c
@@ -13,6 +13,9 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
#ifdef PAM_DYNAMIC
# ifdef PAM_SHL
# include <dl.h>
@@ -20,8 +23,6 @@
# include <dlfcn.h>
# endif /* PAM_SHL */
#endif /* PAM_DYNAMIC */
-#include <fcntl.h>
-#include <unistd.h>
#include "pam_private.h"