Skip to content

Commit ebabcfc

Browse files
authored
Merge pull request #81 from linuxmuster/trixie
Trixie
2 parents 5142c4a + 55b5017 commit ebabcfc

File tree

9 files changed

+41
-17
lines changed

9 files changed

+41
-17
lines changed

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
linuxmuster-linuxclient7 (1.1.0) lmn73-testing; urgency=medium
2+
3+
* implemented debian 13 compatibility.
4+
5+
-- Thomas Schmitt <thomas@linuxmuster.net> Fri, 24 Oct 2025 13:21:21 +0200
6+
17
linuxmuster-linuxclient7 (1.0.11) lmn73; urgency=medium
28

39
* Merge pull request #76 from ks98/master, fixes mount problems with Kerberos after cifs-utils update.

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Source: linuxmuster-linuxclient7
22
Section: linuxmuster
33
Priority: optional
4-
Maintainer: Dorian Zedler <dorian@itsblue.de>, Andreas Till <andreas.till@netzint.de>
4+
Maintainer: Dorian Zedler <dorian@itsblue.de>, Thomas Schmitt <thomas@linuxmuster.net>
55
Build-Depends: debhelper (>= 5.0.0)
66
Standards-Version: 5.0.0
77

88
Package: linuxmuster-linuxclient7
99
Architecture: all
10-
Depends: python3, python3-ldap, cifs-utils, ldb-tools, bind9-host, ipcalc, hxtools, network-manager, krb5-user, keyutils, samba, sssd, sssd-tools, libsss-sudo, adcli, libpam-sss, sudo, realmd, cups (>= 2.3.0), coreutils
10+
Depends: python3, python3-ldap, cifs-utils, ldb-tools, bind9-host, ipcalc, hxtools, network-manager, krb5-user, libpam-krb5, keyutils, samba, sssd, sssd-tools, libsss-sudo, adcli, libpam-sss, sudo, realmd, cups (>= 2.3.0), coreutils
1111
Description: Package for Ubuntu clients to connect to the linuxmuster.net 7 active directory server.
1212
Conflicts: linuxmuster-client-adsso, linuxmuster-client-adsso7, ni-lmn-client-adsso
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
scriptDir=$(linuxmuster-linuxclient7 get-constant scriptDir)
1+
scriptDir=$(/usr/sbin/linuxmuster-linuxclient7 get-constant scriptDir)
22
source $scriptDir/executeHookWithEnvFix.sh onLogin

usr/lib/python3/dist-packages/linuxmusterLinuxclient7/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ def _prepareNetworkConfiguration(domain):
246246
def _preparePam():
247247
# enable necessary pam modules
248248
logging.info('Updating pam configuration ... ')
249-
subprocess.call(['pam-auth-update', '--package', '--enable', 'libpam-mount', 'pwquality', 'sss', '--force'])
249+
subprocess.call(['pam-auth-update', '--package', '--enable', 'krb5', 'libpam-mount', 'pwquality', 'sss', '--force'])
250250
## mkhomedir was injected in template not using pam-auth-update
251-
subprocess.call(['pam-auth-update', '--package', '--remove', 'krb5', 'mkhomedir', '--force'])
251+
subprocess.call(['pam-auth-update', '--package', '--remove', 'mkhomedir', '--force'])
252252

253253
return True
254254

usr/share/linuxmuster-linuxclient7/scripts/executeHookWithEnvFix.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This script calls the desired hook and sources the temporary env
22
# file afterwards to apply environment changes from lmn-export and lmn-unset
33

4-
scriptDir=$(linuxmuster-linuxclient7 get-constant scriptDir)
4+
scriptDir=$(/usr/sbin/linuxmuster-linuxclient7 get-constant scriptDir)
55

66
if [ ! -f $scriptDir/$1 ]; then
77
echo "Unknown hook: $1!"
@@ -10,7 +10,7 @@ if [ ! -f $scriptDir/$1 ]; then
1010
fi
1111

1212
export LinuxmusterLinuxclient7EnvFixActive=1
13-
tmpEnvFile=$(linuxmuster-linuxclient7 get-constant tmpEnvironmentFilePath)
13+
tmpEnvFile=$(/usr/sbin/linuxmuster-linuxclient7 get-constant tmpEnvironmentFilePath)
1414

1515
rm -f $tmpEnvFile
1616

usr/share/linuxmuster-linuxclient7/templates/common-session

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ session required pam_permit.so
3535
# See "man pam_umask".
3636
session optional pam_umask.so
3737
# and here are more per-package modules (the "Additional" block)
38-
session required pam_unix.so
39-
session optional pam_sss.so
40-
session optional pam_systemd.so
38+
session optional pam_krb5.so minimum_uid=1000
39+
session required pam_unix.so
40+
session optional pam_sss.so
41+
session optional pam_systemd.so
4142
# end of pam-auth-update config

usr/share/linuxmuster-linuxclient7/templates/krb5.conf

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
#
55

66
[libdefaults]
7-
default_realm = @@realm@@
8-
default_ccache_name = FILE:/tmp/krb5cc_%{uid}
9-
ticket_lifetime = 24h
10-
renew_lifetime = 7d
7+
default_realm = @@realm@@
8+
dns_lookup_realm = false
9+
dns_lookup_kdc = false
10+
default_ccache_name = FILE:/tmp/krb5cc_%{uid}
11+
ticket_lifetime = 24h
12+
renew_lifetime = 7d
13+
udp_preference_limit = 0
14+
rdns = false
15+
16+
[realms]
17+
@@realm@@ = {
18+
admin_server = @@serverHostname@@
19+
kdc = @@serverHostname@@
20+
}
21+
22+
[domain_realm]
23+
.@@domain@@ = @@realm@@
24+
25+
[logging]
26+
# Log everything to syslog. Default is severity of ERR and facility of AUTH.
27+
default = SYSLOG

usr/share/linuxmuster-linuxclient7/templates/nsswitch.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# WARNING! All changes to this file will be overwritten by linuxmuster-linuxclient7 setup and upgrade!
44
#
55

6-
passwd: files systemd sss
7-
group: files systemd sss
6+
passwd: compat sss
7+
group: compat sss
88
shadow: files sss
99
gshadow: files
1010

usr/share/linuxmuster-linuxclient7/templates/smb.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
client signing = yes
88
client use spnego = yes
99
kerberos method = secrets and keytab
10-
security = user
10+
security = ads
1111
tls verify peer = ca_and_name
1212
tls cafile = /var/lib/samba/private/tls/@@domain@@.pem

0 commit comments

Comments
 (0)