blob: 4fcbb47572e4431b7ae77ce4744ebd32d6797535 [file] [log] [blame]
Patrick Williams705982a2024-01-12 09:51:57 -06001From c533bdced677e2104565fc06602e7e63d9c79ac0 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 6 Nov 2016 23:40:54 -0800
4Subject: [PATCH] Lifted from gentoo and ported to 4.4.5
Brad Bishop316dfdd2018-06-25 12:45:53 -04005
6http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch
7
Patrick Williams520786c2023-06-25 16:20:36 -05008Upstream-Status: Pending
9
Patrick Williams705982a2024-01-12 09:51:57 -060010Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080012 source3/wscript | 13 ++++++++++++-
13 1 file changed, 12 insertions(+), 1 deletion(-)
14
15diff --git a/source3/wscript b/source3/wscript
Patrick Williams705982a2024-01-12 09:51:57 -060016index b7f96f3..ed12b1e 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080017--- a/source3/wscript
18+++ b/source3/wscript
Patrick Williams705982a2024-01-12 09:51:57 -060019@@ -863,7 +863,7 @@ msg.msg_accrightslen = sizeof(fd);
Brad Bishop316dfdd2018-06-25 12:45:53 -040020 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'):
Patrick Williams705982a2024-01-12 09:51:57 -060028@@ -940,6 +940,17 @@ int i; i = PAM_RADIO_TYPE;
Brad Bishop316dfdd2018-06-25 12:45:53 -040029 "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 Geissler517393d2023-01-13 08:55:19 -060046--
472.25.1
48