summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-08-29 15:41:57 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:36 -0500
commit3a516c6b2f4afe2f4e835a1122b13fbb4f0ca4fe (patch)
treed97d08b67797c1d9bf2902e6ce23590a66bdf4b6
parent76d9becbb8c41d81030378844804953733169512 (diff)
downloadsamba-3a516c6b2f4afe2f4e835a1122b13fbb4f0ca4fe.tar.gz
samba-3a516c6b2f4afe2f4e835a1122b13fbb4f0ca4fe.tar.bz2
samba-3a516c6b2f4afe2f4e835a1122b13fbb4f0ca4fe.zip
Add comment about the %o variable not generally being available
(This used to be commit cc38ef35de03a5a476e171f2b3ee4875a27bbd39)
-rw-r--r--docs/smbdotconf/security/passwdchat.xml22
1 files changed, 13 insertions, 9 deletions
diff --git a/docs/smbdotconf/security/passwdchat.xml b/docs/smbdotconf/security/passwdchat.xml
index 32ae5b3033..da18142dfa 100644
--- a/docs/smbdotconf/security/passwdchat.xml
+++ b/docs/smbdotconf/security/passwdchat.xml
@@ -1,6 +1,6 @@
<samba:parameter name="passwd chat"
context="G"
- type="string"
+ type="string"
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
@@ -27,13 +27,17 @@
be executed on the NIS master.
</para>
-
- <para>The string can contain the macro <parameter moreinfo="none">%n</parameter> which is substituted
- for the new password. The chat sequence can also contain the standard
- macros \n, \r, \t and \s to
- give line-feed, carriage-return, tab and space. The chat sequence string can also contain
- a '*' which matches any sequence of characters. Double quotes can be used to collect strings with spaces
- in them into a single string.</para>
+ <para>The string can contain the macro <parameter
+ moreinfo="none">%n</parameter> which is substituted
+ for the new password. The old passsword (<parameter
+ moreinfo="none">%o</parameter>) is only available when
+ <smbconfoption name="encrypt passwords"/> has been disabled.
+ The chat sequence can also contain the standard macros
+ \n, \r, \t and \s to give line-feed, carriage-return, tab
+ and space. The chat sequence string can also contain
+ a '*' which matches any sequence of characters. Double quotes can
+ be used to collect strings with spaces in them into a single
+ string.</para>
<para>If the send string in any part of the chat sequence is a full
stop &quot;.&quot;, then no string is sent. Similarly, if the
@@ -52,5 +56,5 @@
<related>pam password change</related>
<value type="default">*new*password* %n\n*new*password* %n\n *changed*</value>
-<value type="example">&quot;*Enter OLD password*&quot; %o\n &quot;*Enter NEW password*&quot; %n\n &quot;*Reenter NEW password*&quot; %n\n &quot;*Password changed*&quot;</value>
+<value type="example">&quot;*Enter NEW password*&quot; %n\n &quot;*Reenter NEW password*&quot; %n\n &quot;*Password changed*&quot;</value>
</samba:parameter>