[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  9cf9717 s3:docs fix a series of typos in wbinfo manpage
       via  2341422 s3:docs: some corrections for wbinfo
       via  b99becd s3:smbd increase a debug level
      from  468fcfd dns: Fix offset check in ndr_pull_component

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


- Log -----------------------------------------------------------------
commit 9cf97175c7a8eb25e7052e898fd94c98eaa0e2cf
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 4 18:02:30 2011 +0100

    s3:docs fix a series of typos in wbinfo manpage
    
    s/choide/choice/
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Fri Nov  4 19:38:53 CET 2011 on sn-devel-104

commit 23414220125307caf3b1058f738e7249acb043e5
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 4 17:56:02 2011 +0100

    s3:docs: some corrections for wbinfo
    
    Parameters for --sid-aliases and --sid-to-fullname were not listed
    properly in the SYNOPSIS section

commit b99becd4fadd3b5a51df4a95164e69345a3aded3
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 4 17:34:48 2011 +0100

    s3:smbd increase a debug level
    
    logging disconnected clients with level 1 swamps the logs

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

Summary of changes:
 docs-xml/manpages-3/wbinfo.1.xml |   24 ++++++++++++------------
 source3/smbd/process.c           |   11 ++++++-----
 2 files changed, 18 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index a746a0f..93fc0ab 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -24,42 +24,42 @@
 		<arg choice="opt">--allocate-gid</arg>
 		<arg choice="opt">--allocate-uid</arg>
 		<arg choice="opt">-c</arg>
-		<arg choide="opt">--ccache-save</arg>
-		<arg choide="opt">--change-user-password</arg>
+		<arg choice="opt">--ccache-save</arg>
+		<arg choice="opt">--change-user-password</arg>
 		<arg choice="opt">-D domain</arg>
 		<arg choice="opt">--domain domain</arg>
-		<arg choide="opt">--dsgetdcname domain</arg>
+		<arg choice="opt">--dsgetdcname domain</arg>
 		<arg choice="opt">-g</arg>
 		<arg choice="opt">--getdcname domain</arg>
 		<arg choice="opt">--get-auth-user</arg>
 		<arg choice="opt">-G gid</arg>
-		<arg choide="opt">--gid-info gid</arg>
-		<arg choide="opt">--group-info group</arg>
+		<arg choice="opt">--gid-info gid</arg>
+		<arg choice="opt">--group-info group</arg>
 		<arg choice="opt">--help|-?</arg>
 		<arg choice="opt">-i user</arg>
 		<arg choice="opt">-I ip</arg>
 		<arg choice="opt">-K user%password</arg>
-		<arg choide="opt">--lanman</arg>
+		<arg choice="opt">--lanman</arg>
 		<arg choice="opt">-m</arg>
 		<arg choice="opt">-n name</arg>
 		<arg choice="opt">-N netbios-name</arg>
-		<arg choide="opt">--ntlmv2</arg>
-		<arg choide="opt">--online-status</arg>
+		<arg choice="opt">--ntlmv2</arg>
+		<arg choice="opt">--online-status</arg>
 		<arg choice="opt">--own-domain</arg>
 		<arg choice="opt">-p</arg>
 		<arg choice="opt">-P|--ping-dc</arg>
 		<arg choice="opt">-r user</arg>
-		<arg choide="opt">-R|--lookup-rids</arg>
+		<arg choice="opt">-R|--lookup-rids</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">--separator</arg>
 		<arg choice="opt">--set-auth-user user%password</arg>
 		<arg choice="opt">-S sid</arg>
-		<arg choide="opt">--sid-aliases</arg>
-		<arg choide="opt">--sid-to-fullname</arg>
+		<arg choice="opt">--sid-aliases sid</arg>
+		<arg choice="opt">--sid-to-fullname sid</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-u</arg>
 		<arg choice="opt">--uid-info uid</arg>
-		<arg choide="opt">--usage</arg>
+		<arg choice="opt">--usage</arg>
 		<arg choice="opt">--user-domgroups sid</arg>
 		<arg choice="opt">--user-sidinfo sid</arg>
 		<arg choice="opt">--user-sids sid</arg>
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ab0c147..0ad5542 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -456,11 +456,12 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx,
 	status = receive_smb_raw_talloc(mem_ctx, sconn, sock, buffer, timeout,
 					p_unread, &len);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("read_smb_length_return_keepalive failed for "
-			  "client %s read error = %s.\n",
-			  tsocket_address_string(sconn->remote_address,
-						 talloc_tos()),
-			  nt_errstr(status)));
+		DEBUG(NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)?5:1,
+		      ("receive_smb_raw_talloc failed for client %s "
+		       "read error = %s.\n",
+		       tsocket_address_string(sconn->remote_address,
+					      talloc_tos()),
+		       nt_errstr(status)) );
 		return status;
 	}
 


-- 
Samba Shared Repository