[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  613fb98... s3: PAM_RHOST and PAM_TTY are enums on FreeBSD (cherry picked from commit a16a56f60156b3284f9acef9a675122b36ebf7dc)
      from  64a4b02... Do not leak pkt data on the long term cli memory context

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 613fb985f6353a9942ac14d2823a8b55606b706d
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 23 21:00:27 2010 +0200

    s3: PAM_RHOST and PAM_TTY are enums on FreeBSD
    (cherry picked from commit a16a56f60156b3284f9acef9a675122b36ebf7dc)

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/pampass.c |    6 +++---
 source3/configure.in   |   23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/pampass.c b/source3/auth/pampass.c
index e08670f..d509092 100644
--- a/source3/auth/pampass.c
+++ b/source3/auth/pampass.c
@@ -477,7 +477,7 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
 		return False;
 	}
 
-#ifdef PAM_RHOST
+#if HAVE_PAM_RHOST
 	if (rhost == NULL) {
 		our_rhost = client_name(get_client_fd());
 		if (strequal(our_rhost,"UNKNOWN"))
@@ -494,7 +494,7 @@ static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char *rho
 		return False;
 	}
 #endif
-#ifdef PAM_TTY
+#if HAVE_PAM_TTY
 	DEBUG(4,("smb_pam_start: PAM: setting tty\n"));
 	pam_error = pam_set_item(*pamh, PAM_TTY, "samba");
 	if (!smb_pam_error_handler(*pamh, pam_error, "set tty failed", 0)) {
@@ -639,7 +639,7 @@ static bool smb_internal_pam_session(pam_handle_t *pamh, const char *user, const
 {
 	int pam_error;
 
-#ifdef PAM_TTY
+#if HAVE_PAM_TTY
 	DEBUG(4,("smb_internal_pam_session: PAM: tty set to: %s\n", tty));
 	pam_error = pam_set_item(pamh, PAM_TTY, tty);
 	if (!smb_pam_error_handler(pamh, pam_error, "set tty failed", 0))
diff --git a/source3/configure.in b/source3/configure.in
index e8a5417..73819b4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4582,6 +4582,29 @@ if test x"${try_pam}" != x"no";then
 
 	AC_MSG_CHECKING(whether to have PAM MODULES support)
 	AC_MSG_RESULT([$create_pam_modules])
+
+	AC_TRY_COMPILE([
+		#if defined(HAVE_SECURITY_PAM_APPL_H)
+		#include <security/pam_appl.h>
+		#elif defined(HAVE_PAM_PAM_APPL_H)
+		#include <pam/pam_appl.h>
+		#endif],[
+		pam_set_item(0, PAM_RHOST, 0);
+		],
+		AC_DEFINE(HAVE_PAM_RHOST, 1,
+			  [Define to 1 if PAM_RHOST is available]),[])
+
+	AC_TRY_COMPILE([
+		#if defined(HAVE_SECURITY_PAM_APPL_H)
+		#include <security/pam_appl.h>
+		#elif defined(HAVE_PAM_PAM_APPL_H)
+		#include <pam/pam_appl.h>
+		#endif],[
+		pam_set_item(0, PAM_TTY, 0);
+		],
+		AC_DEFINE(HAVE_PAM_TTY, 1,
+			  [Define to 1 if PAM_TTY is available]),[])
+
 fi # try_pam != no
 
 #################################################


-- 
Samba Shared Repository