[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  a6f1c11... s4-smbtorture: Remind myself we need to add a test for SMBsplretq in RAP-PRINTING.
       via  cfb67b1... s3-docs: Fix some of ntlm_auth ntlm-server-1 protocol documentation.
      from  7af7e94... Merge branch 'master' of git+ssh://git.samba.org/data/git/samba

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


- Log -----------------------------------------------------------------
commit a6f1c111ffad6ff3f5017305c274c578368d1739
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 17:09:47 2010 +0200

    s4-smbtorture: Remind myself we need to add a test for SMBsplretq in RAP-PRINTING.
    
    Guenther

commit cfb67b1a169350a8316532eb5d53de4a3f2bacb3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 17:08:36 2010 +0200

    s3-docs: Fix some of ntlm_auth ntlm-server-1 protocol documentation.
    
    Guenther

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

Summary of changes:
 docs-xml/manpages-3/ntlm_auth.1.xml |    6 +++---
 source4/torture/rap/printing.c      |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index a25a985..78ac69c 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -171,13 +171,13 @@
 		    </listitem></varlistentry>
 
 		  <varlistentry>
-		  <term>Username</term>
+		  <term>NT-Domain</term>
                 <listitem><para>The user's domain, expected to be in
                 Samba's <smbconfoption name="unix charset"/>.
                 </para>
 
-		      <para><example>Domain: WORKGROUP</example></para>
-		      <para><example>Domain:: V09SS0dST1VQ</example></para>
+		      <para><example>NT-Domain: WORKGROUP</example></para>
+		      <para><example>NT-Domain:: V09SS0dST1VQ</example></para>
 		    </listitem></varlistentry>
 
 		  <varlistentry>
diff --git a/source4/torture/rap/printing.c b/source4/torture/rap/printing.c
index 4f10606..a2ee582 100644
--- a/source4/torture/rap/printing.c
+++ b/source4/torture/rap/printing.c
@@ -38,6 +38,8 @@
  delete job
  try writing 2nd half
 
+ SMBsplretq
+
 */
 
 #define TORTURE_PRINT_FILE "torture_print_file"


-- 
Samba Shared Repository