Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 1 | From 6822c61ade5617c9f109e32ad4cdc115fa9e12c8 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 6 Nov 2016 23:40:54 -0800 |
| 4 | Subject: [PATCH] Lifted from gentoo and ported to 4.4.5 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 9 | --- |
Patrick Williams | 520786c | 2023-06-25 16:20:36 -0500 | [diff] [blame] | 10 | Upstream-Status: Pending |
| 11 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 12 | source3/wscript | 13 ++++++++++++- |
| 13 | 1 file changed, 12 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/source3/wscript b/source3/wscript |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 16 | index 22be17a..ee9ce52 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 17 | --- a/source3/wscript |
| 18 | +++ b/source3/wscript |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 19 | @@ -862,7 +862,7 @@ msg.msg_accrightslen = sizeof(fd); |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 20 | if conf.env.with_iconv: |
| 21 | conf.DEFINE('HAVE_ICONV', 1) |
| 22 | |
| 23 | - if Options.options.with_pam: |
| 24 | + if Options.options.with_pam != False: |
| 25 | use_pam=True |
| 26 | conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') |
| 27 | if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 28 | @@ -939,6 +939,17 @@ int i; i = PAM_RADIO_TYPE; |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 29 | "or headers not found. Use --without-pam to disable " |
| 30 | "PAM support."); |
| 31 | |
| 32 | + else: |
| 33 | + Logs.warn("PAM disabled") |
| 34 | + use_pam=False |
| 35 | + conf.undefine('WITH_PAM') |
| 36 | + conf.undefine('WITH_PAM_MODULES') |
| 37 | + conf.undefine('HAVE_SECURITY_PAM_APPL_H') |
| 38 | + conf.undefine('PAM_RHOST') |
| 39 | + conf.undefine('PAM_TTY') |
| 40 | + conf.undefine('HAVE_PAM_PAM_APPL_H') |
| 41 | + |
| 42 | + |
| 43 | seteuid = False |
| 44 | |
| 45 | # |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame] | 46 | -- |
| 47 | 2.25.1 |
| 48 | |