[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Mon Dec 21 09:47:48 MST 2009


The branch, master has been updated
       via  9a7bed7... s3-docs: mention long and undocumented option names in rpcclient manpage.
       via  308e1b5... s3-docs: mention long and undocumented option names in smbcacls manpage.
       via  71a5aef... s3-docs: mention long and undocumented option names in smbclient manpage.
       via  6ffa5df... s3-docs: mention -O, --stdout in smbget manpage.
       via  f868672... s3-docs: mention long option names in smbtree manpage.
       via  722a330... s3-docs: mention long and undocumented option names in pdbedit manpage.
      from  0d41278... s3-docs: mention all long option names in samba.entities file.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9a7bed7ae6ec46a848a87b9e9b41e686fffeb26b
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 21 17:30:07 2009 +0100

    s3-docs: mention long and undocumented option names in rpcclient manpage.
    
    Guenther

commit 308e1b51874bc7b3fd7a44bec1367f75b8c975f0
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 21 17:18:53 2009 +0100

    s3-docs: mention long and undocumented option names in smbcacls manpage.
    
    Guenther

commit 71a5aef4e1e054359f419c5540694d3d8d8ededf
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 21 16:24:31 2009 +0100

    s3-docs: mention long and undocumented option names in smbclient manpage.
    
    Guenther

commit 6ffa5df69afbbce4bcf3c26c6068bcd927826ddd
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 21 16:07:42 2009 +0100

    s3-docs: mention -O, --stdout in smbget manpage.
    
    Guenther

commit f8686728147eaf60d09c00d98d65902eb7e77902
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 21 16:04:49 2009 +0100

    s3-docs: mention long option names in smbtree manpage.
    
    Guenther

commit 722a330013280758c2184c0239810229b38c42f0
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 17 15:51:36 2009 +0100

    s3-docs: mention long and undocumented option names in pdbedit manpage.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/pdbedit.8.xml   |  168 ++++++++++++++++++++++++++---------
 docs-xml/manpages-3/rpcclient.1.xml |   11 ++-
 docs-xml/manpages-3/smbcacls.1.xml  |   28 ++----
 docs-xml/manpages-3/smbclient.1.xml |   28 ++++---
 docs-xml/manpages-3/smbget.1.xml    |    8 ++-
 docs-xml/manpages-3/smbtree.1.xml   |    6 +-
 6 files changed, 168 insertions(+), 81 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index d0ea811..86a566d 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -19,30 +19,40 @@
 <refsynopsisdiv>
 	<cmdsynopsis>
 		<command>pdbedit</command>
-		<arg choice="opt">-L</arg>	
-		<arg choice="opt">-v</arg>	
-		<arg choice="opt">-w</arg>	
-		<arg choice="opt">-u username</arg>	
-		<arg choice="opt">-f fullname</arg>	
-		<arg choice="opt">-h homedir</arg>	
-		<arg choice="opt">-D drive</arg>	
-		<arg choice="opt">-S script</arg>
-		<arg choice="opt">-p profile</arg>	
-		<arg choice="opt">-a</arg>	
-		<arg choice="opt">-t, --password-from-stdin</arg>
-		<arg choice="opt">-m</arg>	
-		<arg choice="opt">-r</arg>	
-		<arg choice="opt">-x</arg>	
-		<arg choice="opt">-i passdb-backend</arg>	
-		<arg choice="opt">-e passdb-backend</arg>   
+		<arg choice="opt">-a</arg>
 		<arg choice="opt">-b passdb-backend</arg>
-		<arg choice="opt">-g</arg>
+		<arg choice="opt">-c account-control</arg>
+		<arg choice="opt">-C value</arg>
 		<arg choice="opt">-d debuglevel</arg>
-		<arg choice="opt">-s configfile</arg>
+		<arg choice="opt">-D drive</arg>
+		<arg choice="opt">-e passdb-backend</arg>
+		<arg choice="opt">-f fullname</arg>
+		<arg choice="opt">--force-initialized-passwords</arg>
+		<arg choice="opt">-g</arg>
+		<arg choice="opt">-G SID|RID</arg>
+		<arg choice="opt">-h homedir</arg>
+		<arg choice="opt">-i passdb-backend</arg>
+		<arg choice="opt">-I domain</arg>
+		<arg choice="opt">-L </arg>
+		<arg choice="opt">-m</arg>
+		<arg choice="opt">-N description</arg>
 		<arg choice="opt">-P account-policy</arg>
-		<arg choice="opt">-C value</arg>
-		<arg choice="opt">-c account-control</arg>
+		<arg choice="opt">-p profile</arg>
+		<arg choice="opt">--policies-reset</arg>
+		<arg choice="opt">-r</arg>
+		<arg choice="opt">-s configfile</arg>
+		<arg choice="opt">-S script</arg>
+		<arg choice="opt">-t</arg>
+		<arg choice="opt">--time-format</arg>
+		<arg choice="opt">-u username</arg>
+		<arg choice="opt">-U SID|RID</arg>
+		<arg choice="opt">-v</arg>
+		<arg choice="opt">-V</arg>
+		<arg choice="opt">-w</arg>
+		<arg choice="opt">-x</arg>
 		<arg choice="opt">-y</arg>
+		<arg choice="opt">-z</arg>
+		<arg choice="opt">-Z</arg>
 	</cmdsynopsis>
 </refsynopsisdiv>
 
@@ -69,7 +79,7 @@
 	<title>OPTIONS</title>
 	<variablelist>
 		<varlistentry>
-		<term>-L</term>
+		<term>-L|--list</term>
 		<listitem><para>This option lists all the user accounts
 		present in the users database.
 		This option prints a list of user/uid pairs separated by
@@ -85,7 +95,7 @@ samba:45:Test User
 		
 		
 		<varlistentry>
-		<term>-v</term>
+		<term>-v|--verbose</term>
 		<listitem><para>This option enables the verbose listing format.
 		It causes pdbedit to list the users in the database, printing
 		out the account fields in a descriptive format.</para>
@@ -117,7 +127,7 @@ Profile Path:   \\BERSERKER\profile
 		
 		
 		<varlistentry>
-		<term>-w</term>
+		<term>-w|--smbpasswd-style</term>
 		<listitem><para>This option sets the "smbpasswd" listing format.
 		It will make pdbedit list the users in the database, printing
 		out the account fields in a format compatible with the
@@ -139,7 +149,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		
 		
 		<varlistentry>
-		<term>-u username</term>
+		<term>-u|--user username</term>
 		<listitem><para>This option specifies the username to be
 		used for the operation requested (listing, adding, removing).
 		It is <emphasis>required</emphasis> in add, remove and modify
@@ -149,7 +159,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 
 		<varlistentry>
-		<term>-f fullname</term>
+		<term>-f|--fullname fullname</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's full
 		name. </para>
@@ -159,7 +169,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-h homedir</term>
+		<term>-h|--homedir homedir</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's home
 		directory network path.</para>
@@ -170,7 +180,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-D drive</term>
+		<term>-D|--drive drive</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the windows drive
 		letter to be used to map the home directory.</para>
@@ -182,7 +192,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		
 		
 		<varlistentry>
-		<term>-S script</term>
+		<term>-S|--script script</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's logon
 		script path.</para>
@@ -194,7 +204,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		
 		
 		<varlistentry>
-		<term>-p profile</term>
+		<term>-p|--profile profile</term>
 		<listitem><para>This option can be used while adding or
 		modifing a user account. It will specify the user's profile
 		directory.</para>
@@ -205,7 +215,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 
 		<varlistentry>
-		<term>-G SID|rid</term>
+		<term>-G|'--group SID' SID|rid</term>
 		<listitem><para>
 		This option can be used while adding or modifying a user account. It 
 		will specify the users' new primary group SID (Security Identifier) or 
@@ -216,18 +226,21 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
 		</varlistentry>
 
 		<varlistentry>
-		<term>-U SID|rid</term>
+		<term>-U|'--user SID' SID|rid</term>
 		<listitem><para>
 		This option can be used while adding or modifying a user account. It 
 		will specify the users' new SID (Security Identifier) or 
 		rid. </para>
 
 		<para>Example: <command>-U S-1-5-21-2447931902-1787058256-3961074038-5004</command></para>
+		<para>Example: <command>'--user SID' S-1-5-21-2447931902-1787058256-3961074038-5004</command></para>
+		<para>Example: <command>-U 5004</command></para>
+		<para>Example: <command>'--user SID' 5004</command></para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>-c account-control</term>
+		<term>-c|--account-control account-control</term>
 		<listitem><para>This option can be used while adding or modifying a user
 				account. It will specify the users' account control property. Possible flags are listed below.
 	</para>
@@ -263,7 +276,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
                 </varlistentry>
 
 		<varlistentry>
-		<term>-a</term>
+		<term>-a|--create</term>
 		<listitem><para>This option is used to add a user into the
 		database. This command needs a user name specified with
 		the -u switch. When adding a new user, pdbedit will also
@@ -289,7 +302,7 @@ retype new password
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-t, --password-from-stdin</term>
+		<term>-t|--password-from-stdin</term>
 		<listitem><para>This option causes pdbedit to read the password
 		from standard input, rather than from /dev/tty (like the
 		<command>passwd(1)</command> program does).  The password has
@@ -298,7 +311,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-r</term>
+		<term>-r|--modify</term>
 		<listitem><para>This option is used to modify an existing user 
 		in the database. This command needs a user name specified with the -u 
 		switch. Other options can be specified to modify the properties of 
@@ -308,7 +321,7 @@ retype new password
 		</varlistentry>
 			
 		<varlistentry>
-		<term>-m</term>
+		<term>-m|--machine</term>
 		<listitem><para>This option may only be used in conjunction 
 		with the <parameter>-a</parameter> option. It will make
 		pdbedit to add a machine trust account instead of a user
@@ -321,7 +334,7 @@ retype new password
 		
 		
 		<varlistentry>
-		<term>-x</term>
+		<term>-x|--delete</term>
 		<listitem><para>This option causes pdbedit to delete an account
 		from the database. It needs a username specified with the
 		-u switch.</para>
@@ -332,7 +345,7 @@ retype new password
 		
 
 		<varlistentry>
-		<term>-i passdb-backend</term>
+		<term>-i|--import passdb-backend</term>
 		<listitem><para>Use a different passdb backend to retrieve users
                 than the one specified in smb.conf. Can be used to import data into
                 your local user database.</para>
@@ -346,7 +359,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-e passdb-backend</term>
+		<term>-e|--export passdb-backend</term>
 		<listitem><para>Exports all currently available users to the
 		specified password database backend.</para>
 
@@ -358,7 +371,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-g</term>
+		<term>-g|--group</term>
 		<listitem><para>If you specify <parameter>-g</parameter>,
 		then <parameter>-i in-backend -e out-backend</parameter>
 		applies to the group mapping instead of the user database.</para>
@@ -370,7 +383,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-b passdb-backend</term>
+		<term>-b|--backend passdb-backend</term>
 		<listitem><para>Use a different default passdb backend. </para>
 
 		<para>Example: <command>pdbedit -b xml:/root/pdb-backup.xml -l</command></para>
@@ -378,7 +391,7 @@ retype new password
 		</varlistentry>
 
 		<varlistentry>
-		<term>-P account-policy</term>
+		<term>-P|--account-policy account-policy</term>
 		<listitem><para>Display an account policy</para>
 		<para>Valid policies are: minimum password age, reset count minutes, disconnect time,
 		user must logon to change password, password history, lockout duration, min password length,
@@ -394,7 +407,7 @@ account policy value for bad lockout attempt is 0
 
 
 		<varlistentry>
-		<term>-C account-policy-value</term>
+		<term>-C|--value account-policy-value</term>
 		<listitem><para>Sets an account policy to a specified value. 
 		This option may only be used in conjunction
 		with the <parameter>-P</parameter> option.
@@ -409,7 +422,7 @@ account policy value for bad lockout attempt is now 3
 		</varlistentry>
 
 		<varlistentry>
-		<term>-y</term>
+		<term>-y|--policies</term>
 		<listitem><para>If you specify <parameter>-y</parameter>,
 		then <parameter>-i in-backend -e out-backend</parameter>
 		applies to the account policies instead of the user database.</para>
@@ -422,6 +435,73 @@ account policy value for bad lockout attempt is now 3
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>--force-initialized-passwords</term>
+		<listitem><para>This option forces all users to change their
+				password upon next login.
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-N|--account-desc description</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will specify the user's description
+		field.</para>
+
+		<para>Example: <command>-N "test description"</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-Z|--logon-hours-reset</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will reset the user's allowed logon
+		hours. A user may login at any time afterwards.</para>
+
+		<para>Example: <command>-Z</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-z|--bad-password-count-reset</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will reset the stored bad login
+		counter from a specified user.</para>
+
+		<para>Example: <command>-z</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--policies-reset</term>
+		<listitem><para>This option can be used to reset the general
+				password policies stored for a domain to their
+				default values.</para>
+		<para>Example: <command>--policies-reset</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-I|--domain</term>
+		<listitem><para>This option can be used while adding or
+		modifing a user account. It will specify the user's domain field.</para>
+
+		<para>Example: <command>-I "MYDOMAIN"</command>
+		</para>
+		</listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--time-format</term>
+		<listitem><para>This option is currently not being used.</para>
+		</listitem>
+		</varlistentry>
+
 		&stdarg.help;
 		&stdarg.server.debug;
 		&popt.common.samba;
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index f7cef5f..1a546a9 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -29,7 +29,6 @@
 		<arg choice="opt">-s &lt;smb config file&gt;</arg>
 		<arg choice="opt">-U username[%password]</arg>
 		<arg choice="opt">-W workgroup</arg>
-		<arg choice="opt">-N</arg>
 		<arg choice="opt">-I destinationIP</arg>
 		<arg choice="req">server</arg>
 	</cmdsynopsis>
@@ -70,7 +69,7 @@
 
 		
 		<varlistentry>
-		<term>-I IP-address</term>
+		<term>-I|--dest-ip IP-address</term>
 		<listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. 
 		It should be specified in standard "a.b.c.d" notation. </para>
 
@@ -87,6 +86,14 @@
 		above. </para></listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>-p|--port port</term>
+		<listitem><para>This number is the TCP port number that will be used
+		when making connections to the server. The standard (well-known)
+		TCP port number for an SMB/CIFS server is 139, which is the
+		default. </para></listitem>
+		</varlistentry>
+
 		&stdarg.server.debug;
 		&popt.common.samba;
 		&popt.common.credentials;		
diff --git a/docs-xml/manpages-3/smbcacls.1.xml b/docs-xml/manpages-3/smbcacls.1.xml
index 30b389e..3e63b9b 100644
--- a/docs-xml/manpages-3/smbcacls.1.xml
+++ b/docs-xml/manpages-3/smbcacls.1.xml
@@ -55,7 +55,7 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>-a acls</term>
+		<term>-a|--add acls</term>
 		<listitem><para>Add the ACLs specified to the ACL list.  Existing 
 		access control entries are unchanged. </para></listitem>
 		</varlistentry>
@@ -63,7 +63,7 @@
 		
 		
 		<varlistentry>
-		<term>-M acls</term>
+		<term>-M|--modify acls</term>
 		<listitem><para>Modify the mask value (permissions) for the ACLs 
 		specified on the command line.  An error will be printed for each 
 		ACL specified that was not already present in the ACL list
@@ -73,7 +73,7 @@
 		
 		
 		<varlistentry>
-		<term>-D acls</term>
+		<term>-D|--delete acls</term>
 		<listitem><para>Delete any ACLs specified on the command line.  
 		An error will be printed for each ACL specified that was not 
 		already present in the ACL list. </para></listitem>
@@ -82,7 +82,7 @@
 		
 		
 		<varlistentry>
-		<term>-S acls</term>
+		<term>-S|--set acls</term>
 		<listitem><para>This command sets the ACLs on the file with 
 		only the ones specified on the command line.  All other ACLs are 
 		erased. Note that the ACL specified must contain at least a revision,
@@ -92,20 +92,7 @@
 		
 		
 		<varlistentry>
-		<term>-U username</term>
-		<listitem><para>Specifies a username used to connect to the 
-		specified service.  The username may be of the form "username" in 
-		which case the user is prompted to enter in a password and the 
-		workgroup specified in the <citerefentry><refentrytitle>smb.conf</refentrytitle>
-		<manvolnum>5</manvolnum></citerefentry> file is 
-		used, or "username%password"  or "DOMAIN\username%password" and the 
-		password and workgroup names are used as provided. </para></listitem>
-		</varlistentry>
-		
-		
-		
-		<varlistentry>
-		<term>-C name</term>
+		<term>-C|--chown name</term>
 		<listitem><para>The owner of a file or directory can be changed 
 		to the name given using the <parameter>-C</parameter> option.  
 		The name can be a sid in the form S-1-x-y-z or a name resolved 
@@ -118,7 +105,7 @@
 		
 		
 		<varlistentry>
-		<term>-G name</term>
+		<term>-G|--chgrp name</term>
 		<listitem><para>The group owner of a file or directory can 
 		be changed to the name given using the <parameter>-G</parameter> 
 		option.  The name can be a sid in the form S-1-x-y-z or a name 
@@ -138,7 +125,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-t</term>
+		<term>-t|--test-args</term>
 		<listitem><para>
 		Don't actually do anything, only validate the correctness of 
 		the arguments.
@@ -148,6 +135,7 @@
 		&stdarg.help;
 		&stdarg.server.debug;
 		&popt.common.samba;
+		&popt.common.credentials;
 	</variablelist>
 </refsect1>
 
diff --git a/docs-xml/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index 6b4311d..9c3a97f 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -144,7 +144,7 @@
 		</varlistentry>
 		
 		<varlistentry>
-		<term>-R &lt;name resolve order&gt;</term> 
+		<term>-R|--name-resolve &lt;name resolve order&gt;</term>
 		<listitem><para>This option is used by the programs in the Samba 
 		suite to determine what naming services and in what order to resolve 
 		host names to IP addresses. The option takes a space-separated 
@@ -201,7 +201,7 @@
 		


-- 
Samba Shared Repository


More information about the samba-cvs mailing list