[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  4b89195... s3-util_sock: Rise debug level for getpeername failed messages.
      from  a6f25fc... s3-smbd: Don't close stdout if we want to log to stdout.

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


- Log -----------------------------------------------------------------
commit 4b89195f0c61404a30c8c688df44ce2b3796c370
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Mar 26 15:14:35 2010 +0100

    s3-util_sock: Rise debug level for getpeername failed messages.
    
    Don't show all getpeername failed messages in debug level 0 and 1.
    
    Karolin
    
    Signed-off-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/lib/util_sock.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 08cbced..ced76eb 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -155,8 +155,9 @@ int get_socket_port(int fd)
 	}
 
 	if (getsockname(fd, (struct sockaddr *)&sa, &length) < 0) {
-		DEBUG(0,("getpeername failed. Error was %s\n",
-			strerror(errno) ));
+		int level = (errno == ENOTCONN) ? 2 : 0;
+		DEBUG(level, ("getpeername failed. Error was %s\n",
+			       strerror(errno)));
 		return -1;
 	}
 
@@ -1428,8 +1429,9 @@ static const char *get_peer_addr_internal(int fd,
 	}
 
 	if (getpeername(fd, (struct sockaddr *)pss, plength) < 0) {
-		DEBUG(0,("getpeername failed. Error was %s\n",
-					strerror(errno) ));
+		int level = (errno == ENOTCONN) ? 2 : 0;
+		DEBUG(level, ("getpeername failed. Error was %s\n",
+			       strerror(errno)));
 		return addr_buf;
 	}
 


-- 
Samba Shared Repository