mirror of
https://github.com/cockpit-project/cockpit.git
synced 2026-11-03 21:49:50 -09:00
ws: Drop pam_cockpit_cert stub
Commit 5b5e29a6 (5 years ago, Cockpit 248) dropped that module and just
kept a stub as backwards compatibility, with warnings on upgrades. Let's
finally remove this. RHEL 9.0 shipped with Cockpit 264, so the real
module was never in there.
Users who still have that will now get a "no such module" in the journal
log, which is ok.
This commit is contained in:
Martin Pitt
Martin Pitt
parent
a6d06df8c3
commit
ea10fbcc52
6 changed files with 0 additions and 77 deletions
|
|
@ -48,15 +48,6 @@ cockpit_ws_SOURCES = \
|
|||
cockpit_ws_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS)
|
||||
cockpit_ws_LDADD = $(libcockpit_ws_a_LIBS)
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# pam_cockpit_cert.so: Client certificate authentication PAM module
|
||||
|
||||
pam_PROGRAMS += pam_cockpit_cert.so
|
||||
pam_cockpit_cert_so_CFLAGS = -fPIC $(AM_CFLAGS)
|
||||
pam_cockpit_cert_so_LDADD = -lpam
|
||||
pam_cockpit_cert_so_LDFLAGS = -shared
|
||||
pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# test-server: server for running the html/browser unit tests against
|
||||
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
/*
|
||||
* This file is part of Cockpit.
|
||||
*
|
||||
* Copyright (C) 2019 Red Hat, Inc.
|
||||
*
|
||||
* Cockpit is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation; either version 2.1 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Cockpit is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Cockpit; If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
/* Define which PAM interfaces we provide */
|
||||
#define PAM_SM_AUTH
|
||||
|
||||
#include <security/pam_modules.h>
|
||||
|
||||
/* WARNING:
|
||||
* Stub for backwards compatibility with old configs.
|
||||
* Not in use and will be removed soon.
|
||||
*/
|
||||
|
||||
PAM_EXTERN int
|
||||
pam_sm_authenticate (pam_handle_t *pamh,
|
||||
int flags,
|
||||
int argc,
|
||||
const char **argv)
|
||||
{
|
||||
return PAM_IGNORE;
|
||||
}
|
||||
|
||||
PAM_EXTERN int
|
||||
pam_sm_setcred (pam_handle_t *pamh,
|
||||
int flags,
|
||||
int argc,
|
||||
const char *argv[])
|
||||
{
|
||||
return PAM_SUCCESS;
|
||||
}
|
||||
|
|
@ -449,7 +449,6 @@ authentication via sssd/FreeIPA.
|
|||
%{_unitdir}/system-cockpithttps.slice
|
||||
%{_prefix}/%{__lib}/tmpfiles.d/cockpit-ws.conf
|
||||
%{pamdir}/pam_ssh_add.so
|
||||
%{pamdir}/pam_cockpit_cert.so
|
||||
%{_libexecdir}/cockpit-ws
|
||||
%{_libexecdir}/cockpit-wsinstance-factory
|
||||
%{_libexecdir}/cockpit-tls
|
||||
|
|
@ -488,14 +487,6 @@ fi
|
|||
# firewalld only partially picks up changes to its services files without this
|
||||
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
|
||||
|
||||
# check for deprecated PAM config
|
||||
if test -f %{_sysconfdir}/pam.d/cockpit && grep -q pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
|
||||
echo '**** WARNING:'
|
||||
echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
|
||||
echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'
|
||||
echo '**** WARNING:'
|
||||
fi
|
||||
|
||||
# remove obsolete system user on upgrade (replaced with DynamicUser in version 330)
|
||||
if getent passwd cockpit-wsinstance >/dev/null; then
|
||||
userdel cockpit-wsinstance
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ ${env:deb_systemdsystemunitdir}/cockpit-wsinstance-https@.socket
|
|||
${env:deb_systemdsystemunitdir}/cockpit-wsinstance-socket-user.service
|
||||
${env:deb_systemdsystemunitdir}/system-cockpithttps.slice
|
||||
${env:deb_pamlibdir}/security/pam_ssh_add.so
|
||||
${env:deb_pamlibdir}/security/pam_cockpit_cert.so
|
||||
usr/lib/tmpfiles.d/cockpit-ws.conf
|
||||
usr/lib/cockpit/cockpit-session
|
||||
usr/lib/cockpit/cockpit-ws
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
# this is just an empty stub to avoid breaking existing PAM files
|
||||
cockpit-ws: shared-library-lacks-prerequisites *security/pam_cockpit_cert.so*
|
||||
cockpit-ws: font-outside-font-dir *usr/share/cockpit/static/fonts/*
|
||||
cockpit-ws: font-in-non-font-package *usr/share/cockpit/static/fonts/*
|
||||
cockpit-ws: package-contains-documentation-outside-usr-share-doc *usr/share/cockpit/*html*
|
||||
|
|
|
|||
|
|
@ -44,11 +44,3 @@ if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl 331; then
|
|||
ln -sfn ../../run/cockpit/issue /etc/issue.d/cockpit.issue
|
||||
fi
|
||||
fi
|
||||
|
||||
# check for deprecated PAM config
|
||||
if grep --color=auto pam_cockpit_cert /etc/pam.d/cockpit; then
|
||||
echo '**** WARNING:'
|
||||
echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
|
||||
echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'
|
||||
echo '**** WARNING:'
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue