|
 |
48197f2 |
From d2d3879bdfcea70757a8b0527882e79e8b5c6e70 Mon Sep 17 00:00:00 2001
|
|
|
aeef261 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
48197f2 |
Date: Wed, 27 Nov 2019 18:26:44 +0100
|
|
|
48197f2 |
Subject: [PATCH 1/6] man: move note to the right section
|
|
|
48197f2 |
|
|
|
48197f2 |
Unfortunately the note about the password lifetime was added to the join
|
|
|
48197f2 |
section. This patch move it to the update section where it belongs to.
|
|
|
aeef261 |
|
|
|
aeef261 |
Related to https://bugzilla.redhat.com/show_bug.cgi?id=1738573
|
|
|
48197f2 |
https://bugzilla.redhat.com/show_bug.cgi?id=1745931
|
|
|
48197f2 |
https://bugzilla.redhat.com/show_bug.cgi?id=1774622
|
|
|
48197f2 |
---
|
|
|
48197f2 |
doc/adcli.xml | 12 ++++++------
|
|
|
48197f2 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
aeef261 |
|
|
|
aeef261 |
diff --git a/doc/adcli.xml b/doc/adcli.xml
|
|
|
48197f2 |
index 4f201e0..9faf96a 100644
|
|
|
aeef261 |
--- a/doc/adcli.xml
|
|
|
aeef261 |
+++ b/doc/adcli.xml
|
|
|
48197f2 |
@@ -330,11 +330,7 @@ Password for Administrator:
|
|
|
48197f2 |
important here is currently the
|
|
|
48197f2 |
<option>workgroup</option> option, see
|
|
|
48197f2 |
<citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
48197f2 |
- for details.</para>
|
|
|
48197f2 |
- <para>Note that if the machine account password is not
|
|
|
48197f2 |
- older than 30 days, you have to pass
|
|
|
48197f2 |
- <option>--computer-password-lifetime=0</option> to
|
|
|
48197f2 |
- force the update.</para></listitem>
|
|
|
48197f2 |
+ for details.</para></listitem>
|
|
|
48197f2 |
</varlistentry>
|
|
|
48197f2 |
<varlistentry>
|
|
|
48197f2 |
<term><option>--samba-data-tool=<parameter>/path/to/net</parameter></option></term>
|
|
|
48197f2 |
@@ -472,7 +468,11 @@ $ adcli update --login-ccache=/tmp/krbcc_123
|
|
|
aeef261 |
important here is currently the
|
|
|
aeef261 |
<option>workgroup</option> option, see
|
|
|
aeef261 |
<citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
aeef261 |
- for details.</para></listitem>
|
|
|
aeef261 |
+ for details.</para>
|
|
|
aeef261 |
+ <para>Note that if the machine account password is not
|
|
|
aeef261 |
+ older than 30 days, you have to pass
|
|
|
aeef261 |
+ <option>--computer-password-lifetime=0</option> to
|
|
|
aeef261 |
+ force the update.</para></listitem>
|
|
|
aeef261 |
</varlistentry>
|
|
|
aeef261 |
<varlistentry>
|
|
|
aeef261 |
<term><option>--samba-data-tool=<parameter>/path/to/net</parameter></option></term>
|
|
|
aeef261 |
--
|
|
|
48197f2 |
2.25.1
|
|
|
aeef261 |
|