[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5c26a01 smbcontrol: Fix a typo
       via  236ccbb smbd: Only DEBUG errors from messaging_cleanup
       via  12c781b messaging3: Don't print a message if there's nothing to clean up
       via  131437e lib: Check socket length in ctdbd_connect
      from  c9169a5 s4-rpc: dnsserver: Do not return NS_GLUE records with VIEW_GLUE_DATA filter

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


- Log -----------------------------------------------------------------
commit 5c26a016279468afed258c34cbf4c3501a0e9c90
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 18 08:24:35 2014 +0000

    smbcontrol: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <Ira at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Aug 21 14:58:37 CEST 2014 on sn-devel-104

commit 236ccbbeb71ff565f8608b597107417cbf354f86
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 18 11:59:00 2014 +0000

    smbd: Only DEBUG errors from messaging_cleanup
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ronnie sahlberg <ronniesahlberg at gmail.com>

commit 12c781b9bfd273ca7babce3312821c9ad23707c3
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 18 11:58:05 2014 +0000

    messaging3: Don't print a message if there's nothing to clean up
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ronnie sahlberg <ronniesahlberg at gmail.com>

commit 131437e079ed25be6ea39713bd85898599c2cd2a
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Aug 19 09:20:49 2014 +0000

    lib: Check socket length in ctdbd_connect
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ronnie sahlberg <ronniesahlberg at gmail.com>

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

Summary of changes:
 source3/lib/ctdbd_conn.c   |   10 +++++++++-
 source3/lib/messages_dgm.c |    6 ++++--
 source3/smbd/server.c      |    7 +++++--
 source3/utils/smbcontrol.c |    2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 3e5e838..3ba8385 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -214,6 +214,7 @@ static int ctdbd_connect(int *pfd)
 	struct sockaddr_un addr = { 0, };
 	int fd;
 	socklen_t salen;
+	size_t namelen;
 
 	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (fd == -1) {
@@ -223,7 +224,14 @@ static int ctdbd_connect(int *pfd)
 	}
 
 	addr.sun_family = AF_UNIX;
-	snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", sockname);
+
+	namelen = strlcpy(addr.sun_path, sockname, sizeof(addr.sun_path));
+	if (namelen >= sizeof(addr.sun_path)) {
+		DEBUG(3, ("%s: Socket name too long: %s\n", __func__,
+			  sockname));
+		close(fd);
+		return ENAMETOOLONG;
+	}
 
 	salen = sizeof(struct sockaddr_un);
 
diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index 2c43ec3..e2ee751 100644
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -335,8 +335,10 @@ int messaging_dgm_cleanup(struct messaging_dgm_context *ctx, pid_t pid)
 	fd = open(lockfile_name, O_NONBLOCK|O_WRONLY, 0);
 	if (fd == -1) {
 		ret = errno;
-		DEBUG(10, ("%s: open(%s) failed: %s\n", __func__,
-			   lockfile_name, strerror(ret)));
+		if (ret != ENOENT) {
+			DEBUG(10, ("%s: open(%s) failed: %s\n", __func__,
+				   lockfile_name, strerror(ret)));
+		}
 		TALLOC_FREE(lockfile_name);
 		return ret;
 	}
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bea25cb..1a0d3c9 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -421,8 +421,11 @@ static void remove_child_pid(struct smbd_parent_context *parent,
 	child_id = pid_to_procid(pid);
 
 	ret = messaging_cleanup(parent->msg_ctx, pid);
-	DEBUG(10, ("%s: messaging_cleanup returned %s\n",
-		   __func__, ret ? strerror(ret) : "ok"));
+
+	if ((ret != 0) && (ret != ENOENT)) {
+		DEBUG(10, ("%s: messaging_cleanup returned %s\n",
+			   __func__, ret ? strerror(ret) : "ok"));
+	}
 
 	for (child = parent->children; child != NULL; child = child->next) {
 		if (child->pid == pid) {
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 7c516c4..69d6161 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -225,7 +225,7 @@ static bool do_idmap(struct tevent_context *ev,
 #if defined(HAVE_LIBUNWIND_PTRACE) && defined(HAVE_LINUX_PTRACE)
 
 /* Return the name of a process given it's PID. This will only work on Linux,
- * but that's probably moot since this whole stack tracing implementatino is
+ * but that's probably moot since this whole stack tracing implementation is
  * Linux-specific anyway.
  */
 static const char * procname(pid_t pid, char * buf, size_t bufsz)


-- 
Samba Shared Repository