diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-05-08 21:25:24 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-05-09 08:59:52 +0200 |
| commit | 04ebdce888955069ae2288597a2e50339eda3f4b (patch) | |
| tree | 271c1bb47037cabcc3139d95e17120058dd8c4fa /testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch | |
| parent | 7f9672ea573b02b2665782f9760d8c38b83c46e9 (diff) | |
| download | current-04ebdce888955069ae2288597a2e50339eda3f4b.tar.gz current-04ebdce888955069ae2288597a2e50339eda3f4b.tar.xz | |
Fri May 8 21:25:24 UTC 202020200508212524
a/shadow-4.8.1-x86_64-6.txz: Rebuilt.
Include manpages for sulogin(8).
a/util-linux-2.35.1-x86_64-5.txz: Rebuilt.
ap/sysstat-12.3.3-x86_64-1.txz: Upgraded.
d/bison-3.6-x86_64-1.txz: Upgraded.
l/jansson-2.13.1-x86_64-1.txz: Upgraded.
n/NetworkManager-1.24.0-x86_64-1.txz: Upgraded.
n/fetchmail-6.4.5-x86_64-1.txz: Upgraded.
testing/packages/PAM/shadow-4.8.1-x86_64-6_pam.txz: Rebuilt.
Include manpages for sulogin(8).
Use this version of /bin/su.
testing/packages/PAM/util-linux-2.35.1-x86_64-5_pam.txz: Rebuilt.
Don't use this version of /bin/su.
Diffstat (limited to 'testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch')
| -rw-r--r-- | testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch b/testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch new file mode 100644 index 000000000..b21ab09ee --- /dev/null +++ b/testing/source/PAM/n/nss-pam-ldapd/1025d5de336d8c9585b79df3154b5649da344281.patch @@ -0,0 +1,42 @@ +From 1025d5de336d8c9585b79df3154b5649da344281 Mon Sep 17 00:00:00 2001 +From: Arthur de Jong <arthur@arthurdejong.org> +Date: Sun, 13 Oct 2019 17:23:20 +0200 +Subject: [PATCH] Fix Python 3 compatibility in chsh.ldap + +--- + utils/chsh.py | 6 +++--- + utils/shells.py | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/utils/chsh.py b/utils/chsh.py +index e7537e71..0f24bfcc 100755 +--- a/utils/chsh.py ++++ b/utils/chsh.py +@@ -43,11 +43,11 @@ + def ask_shell(oldshell): + """Ask the user to provide a shell.""" + # Provide Python 2 compatibility ++ prompt = ' Login Shell [%s]: ' % oldshell + try: +- input = raw_input ++ shell = raw_input(prompt) + except NameError: +- pass +- shell = input(' Login Shell [%s]: ' % oldshell) ++ shell = input(prompt) + return shell or oldshell + + +diff --git a/utils/shells.py b/utils/shells.py +index 92dba2f2..327b35e7 100644 +--- a/utils/shells.py ++++ b/utils/shells.py +@@ -35,7 +35,7 @@ def list_shells(): + shell = getusershell() + if not shell: + break +- yield shell ++ yield shell.decode('utf-8') + libc.endusershell() + + |