summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2005-10-17 15:35:00 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:07 -0500
commitff762531775b0171914f7cf0380af32380d1058c (patch)
treef8ec03fddb016ff34847e66464248f6c17cdae69 /docs
parent4ad30f35e0cba0c81ce2ab31b056c7d5095619a5 (diff)
downloadsamba-ff762531775b0171914f7cf0380af32380d1058c.tar.gz
samba-ff762531775b0171914f7cf0380af32380d1058c.tar.bz2
samba-ff762531775b0171914f7cf0380af32380d1058c.zip
Added description of the X flag, removed reference to Samba 2.2, and put in a pointer to the pdbedit man page.
(This used to be commit 160b0ba0e287548fd318634ab0544383c7cb0927)
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages-3/smbpasswd.5.xml17
1 files changed, 10 insertions, 7 deletions
diff --git a/docs/manpages-3/smbpasswd.5.xml b/docs/manpages-3/smbpasswd.5.xml
index a04ea4c831..af17c7c262 100644
--- a/docs/manpages-3/smbpasswd.5.xml
+++ b/docs/manpages-3/smbpasswd.5.xml
@@ -120,17 +120,15 @@
<varlistentry>
<term>Account Flags</term>
<listitem><para>This section contains flags that describe
- the attributes of the users account. In the Samba 2.2 release
- this field is bracketed by '[' and ']' characters and is always
- 13 characters in length (including the '[' and ']' characters).
+ the attributes of the users account. This field is bracketed by
+ '[' and ']' characters and is always 13 characters in length
+ (including the '[' and ']' characters).
The contents of this field may be any of the following characters:
</para>
<itemizedlist>
<listitem><para><emphasis>U</emphasis> - This means
- this is a "User" account, i.e. an ordinary user. Only User
- and Workstation Trust accounts are currently supported
- in the smbpasswd file. </para></listitem>
+ this is a "User" account, i.e. an ordinary user.</para></listitem>
<listitem><para><emphasis>N</emphasis> - This means the
account has no password (the passwords in the fields LANMAN
@@ -143,6 +141,9 @@
<listitem><para><emphasis>D</emphasis> - This means the account
is disabled and no SMB/CIFS logins will be allowed for this user. </para></listitem>
+ <listitem><para><emphasis>X</emphasis> - This means the password
+ does not expire. </para></listitem>
+
<listitem><para><emphasis>W</emphasis> - This means this account
is a "Workstation Trust" account. This kind of account is used
in the Samba PDC code stream to allow Windows NT Workstations
@@ -151,7 +152,9 @@
</itemizedlist>
<para>Other flags may be added as the code is extended in future.
- The rest of this field space is filled in with spaces. </para>
+ The rest of this field space is filled in with spaces. For further
+ information regarding the flags that are supported please refer to the
+ man page for the <command>pdbedit</command> command.</para>
</listitem>
</varlistentry>