Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ipa-nis-manage as we aim to disable NIS server support #7336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions freeipa.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,6 @@ fi
%{_sbindir}/ipa-ldap-updater
%{_sbindir}/ipa-otptoken-import
%{_sbindir}/ipa-compat-manage
%{_sbindir}/ipa-nis-manage
%{_sbindir}/ipa-managed-entries
%{_sbindir}/ipactl
%{_sbindir}/ipa-advise
Expand Down Expand Up @@ -1481,7 +1480,6 @@ fi
%{_mandir}/man1/ipa-ca-install.1*
%{_mandir}/man1/ipa-kra-install.1*
%{_mandir}/man1/ipa-compat-manage.1*
%{_mandir}/man1/ipa-nis-manage.1*
%{_mandir}/man1/ipa-managed-entries.1*
%{_mandir}/man1/ipa-ldap-updater.1*
%{_mandir}/man8/ipactl.8*
Expand Down
2 changes: 0 additions & 2 deletions install/share/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ dist_app_DATA = \
master-entry.ldif \
memberof-task.ldif \
memberof-conf.ldif \
nis.uldif \
nis-update.uldif \
opendnssec_conf.template \
opendnssec_kasp.template \
unique-attributes.ldif \
Expand Down
38 changes: 0 additions & 38 deletions install/share/nis-update.uldif

This file was deleted.

96 changes: 0 additions & 96 deletions install/share/nis.uldif

This file was deleted.

2 changes: 0 additions & 2 deletions install/tools/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ dist_noinst_DATA = \
ipa-server-upgrade.in \
ipactl.in \
ipa-compat-manage.in \
ipa-nis-manage.in \
ipa-managed-entries.in \
ipa-ldap-updater.in \
ipa-otptoken-import.in \
Expand Down Expand Up @@ -56,7 +55,6 @@ nodist_sbin_SCRIPTS = \
ipa-server-upgrade \
ipactl \
ipa-compat-manage \
ipa-nis-manage \
ipa-managed-entries \
ipa-ldap-updater \
ipa-otptoken-import \
Expand Down
17 changes: 14 additions & 3 deletions install/tools/ipa-compat-manage.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ from ipaplatform.paths import paths
try:
from optparse import OptionParser # pylint: disable=deprecated-module
from ipapython import ipautil, config
from ipapython.ipaldap import realm_to_serverid
from ipaserver.install import installutils
from ipaserver.install.ldapupdate import LDAPUpdate
from ipalib import api, errors
Expand Down Expand Up @@ -150,9 +151,19 @@ def main():
try:
entry = get_entry(nis_config_dn)
# We can't disable schema compat if the NIS plugin is enabled
if entry is not None and entry.get('nsslapd-pluginenabled', [''])[0].lower() == 'on':
print("The NIS plugin is configured, cannot disable compatibility.", file=sys.stderr)
print("Run 'ipa-nis-manage disable' first.", file=sys.stderr)
if (
entry is not None
and entry.get("nsslapd-pluginenabled", [""])[0].lower() == "on"
):
instance = realm_to_serverid(api.env.realm)
print(
"The NIS plugin is configured, cannot "
"disable compatibility.", file=sys.stderr,
)
print(
f"Run \"dsconf {instance} plugin set --enabled off "
"'NIS Server'\" first.", file=sys.stderr,
)
retval = 2
except errors.ExecutionError as lde:
print("An error occurred while talking to the server.")
Expand Down