1
diff --git a/debian/changelog b/debian/changelog
2
index 3084fe8..2fa2b4f 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,11 @@
6
1
nss-pam-ldapd (0.9.13-2ubuntu2) resolute; urgency=medium
7
2
8
3
  * d/t/testsuite: fix slapd apparmor access to test directory (LP: #2130351)
9
4
    - d/t/apparmor.sh: ignore apparmor control failures on Ubuntu+armhf
10
5
      (LP: #2008393)
11
6
12
7
 -- Jonas Jelten <jonas.jelten@canonical.com>  Wed, 12 Nov 2025 16:42:10 +0100
13
8
14
1
nss-pam-ldapd (0.9.13-2ubuntu1) resolute; urgency=medium
9
nss-pam-ldapd (0.9.13-2ubuntu1) resolute; urgency=medium
15
2
10
16
3
  * d/control: Recommends: networkd-dispatcher (LP: #2132159)
11
  * d/control: Recommends: networkd-dispatcher (LP: #2132159)
17
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
18
index 0e070a0..1370943 100755
19
--- a/debian/tests/testsuite
20
+++ b/debian/tests/testsuite
21
@@ -38,11 +38,40 @@ service unscd stop || true
22
38
# temporary file to keep nslcd debug output
38
# temporary file to keep nslcd debug output
23
39
nslcd_debug_log=`mktemp -t nslcd.debug.log.XXXXXX`
39
nslcd_debug_log=`mktemp -t nslcd.debug.log.XXXXXX`
24
40
40
25
41
if [ "$(aa-enabled 2> /dev/null)" = "Yes" ]; then
26
42
  apparmor_enabled="true"
27
43
else
28
44
  apparmor_enabled="false"
29
45
fi
30
46
31
47
_apparmor_check() {
32
48
	# allow command to fail if running on Ubuntu-armhf (due to LP: #2008393)
33
49
	"$@" && return 0
34
50
	_ret=$?
35
51
36
52
	if [ "$(dpkg-vendor --query Vendor)-$(dpkg --print-architecture)" = "Ubuntu-armhf" ]; then
37
53
		echo "WARNING: failed to perform apparmor command: $*" >&2
38
54
		echo "On armhf and Ubuntu DEP8 infrastructure, this is not a fatal error." >&2
39
55
		echo "See LP: #2008393 for details." >&2
40
56
		return 0
41
57
	fi
42
58
43
59
	echo "apparmor command failed: $*" >&2
44
60
	exit $_ret
45
61
}
46
62
47
63
48
41
# Clean up on exit
64
# Clean up on exit
49
42
cleanup() {
65
cleanup() {
50
43
  echo "$script: cleaning up..."
66
  echo "$script: cleaning up..."
51
44
  service nslcd stop || true
67
  service nslcd stop || true
52
45
  service pynslcd stop || true
68
  service pynslcd stop || true
53
69
  if [ "$apparmor_enabled" = true ]; then
54
70
    echo "$script: restoring apparmor config for slapd..."
55
71
    rm /etc/apparmor.d/local/usr.sbin.slapd
56
72
    [ -f $tmpslapd/apparmor.bak ] && mv $tmpslapd/apparmor.bak /etc/apparmor.d/local/usr.sbin.slapd
57
73
    _apparmor_check apparmor_parser -W -T -r /etc/apparmor.d/usr.sbin.slapd
58
74
  fi
59
46
  [ -n "$tmpslapd" ] && tests/setup_slapd.sh "$tmpslapd" clean
75
  [ -n "$tmpslapd" ] && tests/setup_slapd.sh "$tmpslapd" clean
60
47
  echo "$script: restoring configuration..."
76
  echo "$script: restoring configuration..."
61
48
  if [ -n "$bkdir" ]
77
  if [ -n "$bkdir" ]
62
@@ -71,10 +100,19 @@ tests/testenv.sh nss_enable \
63
71
100
64
72
# configure PAM?
101
# configure PAM?
65
73
102
67
74
# configure and start slapd
103
# set up test environment
68
75
echo "$script: setting up test slapd..."
104
echo "$script: setting up test slapd..."
69
76
tmpslapd=`mktemp -d -t slapd.XXXXXX`
105
tmpslapd=`mktemp -d -t slapd.XXXXXX`
70
77
tests/setup_slapd.sh "$tmpslapd" setup
106
tests/setup_slapd.sh "$tmpslapd" setup
71
107
# if apparmor is used, allow access to test directory
72
108
if [ "$apparmor_enabled" = true ]; then
73
109
  # this directory is like /etc/slapd
74
110
  echo "$script: backing up and replacing apparmor config for slapd..."
75
111
  [ -f /etc/apparmor.d/local/usr.sbin.slapd ] && mv /etc/apparmor.d/local/usr.sbin.slapd $tmpslapd/apparmor.bak
76
112
  echo "$tmpslapd/** kwr," >> /etc/apparmor.d/local/usr.sbin.slapd
77
113
  _apparmor_check apparmor_parser -W -T -r /etc/apparmor.d/usr.sbin.slapd
78
114
fi
79
115
# configure and start slapd
80
78
tests/setup_slapd.sh "$tmpslapd" start
116
tests/setup_slapd.sh "$tmpslapd" start
81
79
117
82
80
# set up nslcd.conf
118
# set up nslcd.conf
Reviewer	Date Requested	Status
Andreas Hasenack	2025-11-20	Approve on 2025-12-08
Canonical Server Reporter	2025-11-20	Pending
Review via email: mp+496111@code.launchpad.net