The branch, v3-4-stable has been updated
via 3eac232fdcae51843110ba84cd1698c1ac4be8af (commit)
via 654024cd4625c1797e2bb19c20033a3e29feccbc (commit)
from f8096d726049660f7a72cc100feb718ae9320b47 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit 3eac232fdcae51843110ba84cd1698c1ac4be8af
Author: Karolin Seeger <[email protected]>
Date: Sat Jun 27 11:47:06 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 2fdd917894c3571a101ac6f9cafd63585bcb8d52)
commit 654024cd4625c1797e2bb19c20033a3e29feccbc
Author: Bo Yang <[email protected]>
Date: Fri May 29 16:10:19 2009 +0800
s3: fix building of pam_smbpass.
Signed-off-by: Bo Yang <[email protected]>
Signed-off-by: Michael Adam <[email protected]>
(cherry picked from commit de4c8478e5f6de8c9207f15287b52cb383a903bf)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 9 ++++++++-
source3/pam_smbpass/support.c | 15 +++++++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 64959d5..06177ca 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -218,6 +218,10 @@ o Volker Lendecke <[email protected]>
* BUG 6498: Add workaround for MS KB932762.
+o Bo Yang <[email protected]>
+ * BUG 6499: Fix building of pam_smbpass.
+
+
Changes since 3.4.0pre2
-----------------------
@@ -335,10 +339,13 @@ o Ole Hansen <[email protected]>
o Björn Jacke <[email protected]>
- * BUG 4831: Don't call openlog() or closelog() from pam_smbpass.
* Also handle DirX return codes.
+o Steve Langasek <[email protected]>
+ * BUG 4831: Don't call openlog() or closelog() from pam_smbpass.
+
+
o Volker Lendecke <[email protected]>
* BUG 5681: Do not limit the number of network interfaces.
* BUG 6157: Fix handling of multi-value attribute "uid".
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index 50a2a14..dabd57d 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -20,6 +20,21 @@
#include "support.h"
+#if defined(HAVE_SECURITY_PAM_EXT_H)
+#include <security/pam_ext.h>
+#elif defined(HAVE_PAM_PAM_EXT_H)
+#include <pam/pam_ext.h>
+#endif
+
+#if defined(HAVE_SECURITY__PAM_MACROS_H)
+#include <security/_pam_macros.h>
+#elif defined(HAVE_PAM__PAM_MACROS_H)
+#include <pam/_pam_macros.h>
+#endif
+
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
#define _pam_overwrite(x) \
do { \
--
Samba Shared Repository
