summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Stephenson <jstephen@redhat.com>2017-05-12 22:42:40 -0400
committerLukas Slebodnik <lslebodn@redhat.com>2017-09-25 21:50:32 +0200
commitda19eaea902744ec3cb41f87fa93fadb767f90e7 (patch)
tree7ddcb30ef6207b27626d63f6d2206ac0579d98c1
parentd2c614143870e6efd4b3ab20c3a55cf714595256 (diff)
downloadsssd-da19eaea902744ec3cb41f87fa93fadb767f90e7.tar.gz
sssd-da19eaea902744ec3cb41f87fa93fadb767f90e7.tar.xz
sssd-da19eaea902744ec3cb41f87fa93fadb767f90e7.zip
SSSCTL: Replace sss_debuglevel with shell wrapper
The sss_debuglevel binary is replaced by a shell wrapper calling sssctl debug-level as part of merging sss_debuglevel into sssctl. The wrapper will redirect sss_debuglevel to the sssctl debug-level command performing the same task. The sss_debuglevel(8) man page is updated to indicate that sss_debuglevel is deprecated and functionality exists now in sssctl. Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com> Reviewed-by: Jakub Hrozek <jhrozek@redhat.com> Reviewed-by: Michal Židek <mzidek@redhat.com>
-rw-r--r--Makefile.am13
-rw-r--r--contrib/sssd.spec.in2
-rw-r--r--src/man/sss_debuglevel.8.xml36
-rw-r--r--src/tools/wrappers/sss_debuglevel.in4
4 files changed, 22 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index 352401ce5..cb2075b93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -432,6 +432,10 @@ py3exec_LTLIBRARIES = \
$(NULL)
endif
+sbin_SCRIPTS = \
+ src/tools/wrappers/sss_debuglevel \
+ $(NULL)
+
dist_noinst_SCRIPTS = \
$(EXTRA_SCRIPTS) \
src/config/setup.py \
@@ -4668,6 +4672,14 @@ src/sysv/systemd/sssd-kcm.service: src/sysv/systemd/sssd-kcm.service.in Makefile
$(replace_script)
endif
+EXTRA_DIST += \
+ src/tools/wrappers/sss_debuglevel.in \
+ $(NULL)
+
+src/tools/wrappers/sss_debuglevel: src/tools/wrappers/sss_debuglevel.in Makefile
+ @$(MKDIR_P) src/tools/wrappers/
+ $(replace_script)
+
SSSD_USER_DIRS = \
$(DESTDIR)$(dbpath) \
$(DESTDIR)$(keytabdir) \
@@ -4912,6 +4924,7 @@ endif
rm -f $(builddir)/src/sysv/systemd/sssd-kcm.socket
rm -f $(builddir)/src/sysv/systemd/sssd-kcm.service
rm -f $(builddir)/src/sysv/systemd/journal.conf
+ rm -f $(builddir)/src/tools/wrappers/sss_debuglevel
CLEANFILES += *.X */*.X */*/*.X
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 48ee3d7b9..e76b51833 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -1127,7 +1127,7 @@ done
%{_sbindir}/sss_groupshow
%{_sbindir}/sss_obfuscate
%{_sbindir}/sss_override
-#%{_sbindir}/sss_debuglevel
+%{_sbindir}/sss_debuglevel
%{_sbindir}/sss_seed
%{_sbindir}/sssctl
%{_mandir}/man8/sss_groupadd.8*
diff --git a/src/man/sss_debuglevel.8.xml b/src/man/sss_debuglevel.8.xml
index eb11540d8..0538dc502 100644
--- a/src/man/sss_debuglevel.8.xml
+++ b/src/man/sss_debuglevel.8.xml
@@ -13,7 +13,7 @@
<refnamediv id='name'>
<refname>sss_debuglevel</refname>
- <refpurpose>change debug level while SSSD is running</refpurpose>
+ <refpurpose>[DEPRECATED] change debug level while SSSD is running</refpurpose>
</refnamediv>
<refsynopsisdiv id='synopsis'>
@@ -29,40 +29,12 @@
<refsect1 id='description'>
<title>DESCRIPTION</title>
<para>
- <command>sss_debuglevel</command> changes debug level of SSSD monitor
- and providers to <replaceable>NEW_DEBUG_LEVEL</replaceable> while SSSD is running.
+ <command>sss_debuglevel</command> is deprecated and replaced
+ by the sssctl debug-level command. Please refer to the
+ <command>sssctl</command> man page for more information on sssctl usage.
</para>
</refsect1>
- <refsect1 id='options'>
- <title>OPTIONS</title>
- <variablelist remap='IP'>
- <varlistentry>
- <term>
- <option>-c</option>,<option>--config</option>
- </term>
- <listitem>
- <para>
- Specify a non-default config file. The default is
- <filename>/etc/sssd/sssd.conf</filename>. For reference
- on the config file syntax and options, consult the
- <citerefentry>
- <refentrytitle>sssd.conf</refentrytitle>
- <manvolnum>5</manvolnum>
- </citerefentry>
- manual page.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- <replaceable>NEW_DEBUG_LEVEL</replaceable>
- </term>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/debug_levels.xml" />
- </varlistentry>
- </variablelist>
- </refsect1>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/seealso.xml" />
</refentry>
diff --git a/src/tools/wrappers/sss_debuglevel.in b/src/tools/wrappers/sss_debuglevel.in
new file mode 100644
index 000000000..8df4918d6
--- /dev/null
+++ b/src/tools/wrappers/sss_debuglevel.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+sbindir=@sbindir@
+echo "Redirecting to $sbindir/sssctl debug-level"
+$sbindir/sssctl debug-level $@