From 6de7d2e033d67f23b33620a2b80f5a6c106bd6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Mon, 10 Jun 2019 10:53:15 +0200 Subject: [PATCH 2/3] rhel9: remove ecryptfs support --- profiles/nis/README | 3 --- profiles/nis/fingerprint-auth | 1 - profiles/nis/password-auth | 1 - profiles/nis/postlogin | 4 ---- profiles/nis/system-auth | 1 - profiles/sssd/README | 3 --- profiles/sssd/fingerprint-auth | 1 - profiles/sssd/password-auth | 1 - profiles/sssd/postlogin | 4 ---- profiles/sssd/smartcard-auth | 1 - profiles/sssd/system-auth | 1 - profiles/winbind/README | 3 --- profiles/winbind/fingerprint-auth | 1 - profiles/winbind/password-auth | 1 - profiles/winbind/postlogin | 4 ---- profiles/winbind/system-auth | 1 - src/compat/authcompat.py.in.in | 1 - src/compat/authcompat_Options.py | 2 +- src/man/authselect-migration.7.adoc | 5 ++--- 19 files changed, 3 insertions(+), 36 deletions(-) diff --git a/profiles/nis/README b/profiles/nis/README index 5dbb9b49fb7708ef3b073aff7e1883e3f9a0bd06..cac3428bf844b0a9d251015988583f4c1b15c3c9 100644 --- a/profiles/nis/README +++ b/profiles/nis/README @@ -21,9 +21,6 @@ with-mkhomedir:: Enable automatic creation of home directories for users on their first login. -with-ecryptfs:: - Enable automatic per-user ecryptfs. - with-fingerprint:: Enable authentication with fingerprint reader through *pam_fprintd*. diff --git a/profiles/nis/fingerprint-auth b/profiles/nis/fingerprint-auth index 756993cf1b2095f505208df19dd739dcaed1af31..eebec6d0d6edeae6a3eb224f0ff284016b0fc642 100644 --- a/profiles/nis/fingerprint-auth +++ b/profiles/nis/fingerprint-auth @@ -13,7 +13,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/nis/password-auth b/profiles/nis/password-auth index 7997ea8de61ad6392ed01c39727f70253b5cc0ca..9a8ae9cde644a4ac981f4b9553af2f0f428bfebb 100644 --- a/profiles/nis/password-auth +++ b/profiles/nis/password-auth @@ -17,7 +17,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/nis/postlogin b/profiles/nis/postlogin index 137cd00dc65ee9ea83123f1d3a6f7ba04f0aea04..04a11f049bc1e220c9064fba7b46eb243ddd4996 100644 --- a/profiles/nis/postlogin +++ b/profiles/nis/postlogin @@ -1,7 +1,3 @@ -auth optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} - -password optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} - session optional pam_umask.so silent session [success=1 default=ignore] pam_succeed_if.so service !~ gdm* service !~ su* quiet session [default=1] pam_lastlog.so nowtmp {if "with-silent-lastlog":silent|showfailed} diff --git a/profiles/nis/system-auth b/profiles/nis/system-auth index 057b31e074f29c46b492fa310a954e281631800e..2e7462983d35e4a2f5cef8151ed53baaf7e5c790 100644 --- a/profiles/nis/system-auth +++ b/profiles/nis/system-auth @@ -18,7 +18,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/sssd/README b/profiles/sssd/README index 95ef5dc785ed0530122837b5e08d03590ed1ada5..ac063e8d065d0488279dc2381bdd7f8ac361bfcb 100644 --- a/profiles/sssd/README +++ b/profiles/sssd/README @@ -40,9 +40,6 @@ with-mkhomedir:: Enable automatic creation of home directories for users on their first login. -with-ecryptfs:: - Enable automatic per-user ecryptfs. - with-smartcard:: Enable authentication with smartcards through SSSD. Please note that smartcard support must be also explicitly enabled within diff --git a/profiles/sssd/fingerprint-auth b/profiles/sssd/fingerprint-auth index fe3cac7a976845017d034ac1158a38f889926ce8..ad0a95440ebd006ff88264177598c77afc472dda 100644 --- a/profiles/sssd/fingerprint-auth +++ b/profiles/sssd/fingerprint-auth @@ -18,7 +18,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/sssd/password-auth b/profiles/sssd/password-auth index d6953428cca7d6518f63c3fdbaabc4746c35f91b..6d87cbe0a805bf5d3ab2a6192d570b9e5c6dc143 100644 --- a/profiles/sssd/password-auth +++ b/profiles/sssd/password-auth @@ -27,7 +27,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/sssd/postlogin b/profiles/sssd/postlogin index 137cd00dc65ee9ea83123f1d3a6f7ba04f0aea04..04a11f049bc1e220c9064fba7b46eb243ddd4996 100644 --- a/profiles/sssd/postlogin +++ b/profiles/sssd/postlogin @@ -1,7 +1,3 @@ -auth optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} - -password optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} - session optional pam_umask.so silent session [success=1 default=ignore] pam_succeed_if.so service !~ gdm* service !~ su* quiet session [default=1] pam_lastlog.so nowtmp {if "with-silent-lastlog":silent|showfailed} diff --git a/profiles/sssd/smartcard-auth b/profiles/sssd/smartcard-auth index 230269c42508a50ad5b4677ab6514b9afe4d5fbf..874ffaca1b2c15c81adc4ca130c15834154bdc0e 100644 --- a/profiles/sssd/smartcard-auth +++ b/profiles/sssd/smartcard-auth @@ -16,7 +16,6 @@ account required pam_permit.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/sssd/system-auth b/profiles/sssd/system-auth index 6f914ea91eb7782d60959ced56112f9cc1365347..dfc53b4ce55a0d575dc4fe68004a846f43360ccc 100644 --- a/profiles/sssd/system-auth +++ b/profiles/sssd/system-auth @@ -32,7 +32,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/winbind/README b/profiles/winbind/README index 40a1a459355d2ee8ab98e31d2868cb24261e2c17..0e80bb697f8050ac8eb3c78d4f41945b9bcbba29 100644 --- a/profiles/winbind/README +++ b/profiles/winbind/README @@ -33,9 +33,6 @@ with-mkhomedir:: Enable automatic creation of home directories for users on their first login. -with-ecryptfs:: - Enable automatic per-user ecryptfs. - with-fingerprint:: Enable authentication with fingerprint reader through *pam_fprintd*. diff --git a/profiles/winbind/fingerprint-auth b/profiles/winbind/fingerprint-auth index c4b8261ca45d4f6b9eda03ea96850bb32d605d30..6262549af2ca8aed540e7a7e1d97e0ba3b2ef088 100644 --- a/profiles/winbind/fingerprint-auth +++ b/profiles/winbind/fingerprint-auth @@ -17,7 +17,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/winbind/password-auth b/profiles/winbind/password-auth index bbeca057d49102889e3eeee040ea256dbd751eef..aef4d5ce6a6ec9496deabc1010cde0370a3ecba7 100644 --- a/profiles/winbind/password-auth +++ b/profiles/winbind/password-auth @@ -24,7 +24,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/profiles/winbind/postlogin b/profiles/winbind/postlogin index 137cd00dc65ee9ea83123f1d3a6f7ba04f0aea04..04a11f049bc1e220c9064fba7b46eb243ddd4996 100644 --- a/profiles/winbind/postlogin +++ b/profiles/winbind/postlogin @@ -1,7 +1,3 @@ -auth optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} - -password optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} - session optional pam_umask.so silent session [success=1 default=ignore] pam_succeed_if.so service !~ gdm* service !~ su* quiet session [default=1] pam_lastlog.so nowtmp {if "with-silent-lastlog":silent|showfailed} diff --git a/profiles/winbind/system-auth b/profiles/winbind/system-auth index 8e6026b782f8bd7e64632a9acedf304bd95f29e1..e4bdd0bf1c315c86cc8064625b80161baa5c455f 100644 --- a/profiles/winbind/system-auth +++ b/profiles/winbind/system-auth @@ -25,7 +25,6 @@ password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so -session optional pam_ecryptfs.so unwrap {include if "with-ecryptfs"} -session optional pam_systemd.so session optional pam_oddjob_mkhomedir.so {include if "with-mkhomedir"} session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid diff --git a/src/compat/authcompat.py.in.in b/src/compat/authcompat.py.in.in index e4b8c05c6a11a215529ba66f8b36b72a6ac18448..4e39b7ec66d0e2ba911c7280467ba78fd29c196c 100755 --- a/src/compat/authcompat.py.in.in +++ b/src/compat/authcompat.py.in.in @@ -520,7 +520,6 @@ class AuthCompat: 'smartcard' : 'with-smartcard', 'requiresmartcard' : 'with-smartcard-required', 'fingerprint' : 'with-fingerprint', - 'ecryptfs' : 'with-ecryptfs', 'mkhomedir' : 'with-mkhomedir', 'faillock' : 'with-faillock', 'pamaccess' : 'with-pamaccess', diff --git a/src/compat/authcompat_Options.py b/src/compat/authcompat_Options.py index c8f52ab6773c4cd5371f32121dba8053f3443261..433a3340bac29739174e78928701214c08ec6f3c 100644 --- a/src/compat/authcompat_Options.py +++ b/src/compat/authcompat_Options.py @@ -93,7 +93,6 @@ class Options: Option.Valued ("smartcardaction", _("<0=Lock|1=Ignore>"), _("action to be taken on smart card removal")), Option.Feature("requiresmartcard",_("require smart card for authentication by default")), Option.Feature("fingerprint", _("authentication with fingerprint readers by default")), - Option.Feature("ecryptfs", _("automatic per-user ecryptfs")), Option.Feature("krb5", _("Kerberos authentication by default")), Option.Valued ("krb5kdc", _(""), _("default Kerberos KDC")), Option.Valued ("krb5adminserver", _(""), _("default Kerberos admin server")), @@ -141,6 +140,7 @@ class Options: # layers and will produce warning when used. They will not affect # the system. Option.UnsupportedFeature("cache"), + Option.UnsupportedFeature("ecryptfs"), Option.UnsupportedFeature("shadow"), Option.UnsupportedSwitch ("useshadow"), Option.UnsupportedFeature("md5"), diff --git a/src/man/authselect-migration.7.adoc b/src/man/authselect-migration.7.adoc index 35ba484d576ab8a3d923a124f6b1577085deedd4..a27af036738274d8d392f7fe1f7d59c89e9c4ffb 100644 --- a/src/man/authselect-migration.7.adoc +++ b/src/man/authselect-migration.7.adoc @@ -80,7 +80,6 @@ configuration file for required services. |*Authconfig options* |*Authselect profile feature* |--enablesmartcard |with-smartcard |--enablefingerprint |with-fingerprint -|--enableecryptfs |with-ecryptfs |--enablemkhomedir |with-mkhomedir |--enablefaillock |with-faillock |--enablepamaccess |with-pamaccess @@ -95,8 +94,8 @@ authselect select sssd with-faillock authconfig --enablesssd --enablesssdauth --enablesmartcard --smartcardmodule=sssd --updateall authselect select sssd with-smartcard -authconfig --enableecryptfs --enablepamaccess --updateall -authselect select sssd with-ecryptfs with-pamaccess +authconfig --enablepamaccess --updateall +authselect select sssd with-pamaccess authconfig --enablewinbind --enablewinbindauth --winbindjoin=Administrator --updateall realm join -U Administrator --client-software=winbind WINBINDDOMAIN -- 2.29.2