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.

diff --git a/CHANGELOG b/CHANGELOG
index f9bb5f8089cd1a956f068a0e62898aa612a30578..a2c050bafbefe6dc260d358e27e6378012f5b163 100644 (file)
--- 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 d007ed9858f4bf92d50d4cbbf4e64af1d554cc56..62b7446ccc408a882e24b40b651bc888552ee9e3 100644 (file)
--- 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"