[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  76ef9c1 build: line-break deps for 'param' subsystem
       via  123e658 build: fix quotation of deps for 'param' subsystem.
       via  7d49d9b ctdb-server: fix a possible fd leak in ctdb_tcp_listen_automatic()
       via  4010c03 ctdb: improve a misleading help text.
       via  3f402eb ctdb-doc: remove description of removed --syslog option from ctdbd manpage
      from  7d84cd6 pam_winbind: Fix a segfault if initialization fails

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


- Log -----------------------------------------------------------------
commit 76ef9c17d3f0e7df49c342b7b57183720b69bd82
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 10 16:48:40 2014 +0200

    build: line-break deps for 'param' subsystem
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Wed Sep  9 13:12:43 CEST 2015 on sn-devel-104

commit 123e6584ae064a513d0c1abc5137198e18a1d1bc
Author: Michael Adam <obnox at samba.org>
Date:   Fri Jul 3 12:12:44 2015 +0200

    build: fix quotation of deps for 'param' subsystem.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit 7d49d9b4a135f97e6d94ffe14979259ecd3f0cae
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 8 10:01:31 2015 +0200

    ctdb-server: fix a possible fd leak in ctdb_tcp_listen_automatic()
    
    sockets are created in a loop until an unused address is found.
    But the unused socket fds were not closed.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit 4010c03e3dcea7d79ca6371f5c57d56b42043822
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 7 18:09:44 2015 +0200

    ctdb: improve a misleading help text.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

commit 3f402eb8cf5ea32321fb4cfb10b69f08c8c20220
Author: Michael Adam <obnox at samba.org>
Date:   Tue Sep 8 10:08:20 2015 +0200

    ctdb-doc: remove description of removed --syslog option from ctdbd manpage
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

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

Summary of changes:
 ctdb/doc/ctdbd.1.xml            | 11 -----------
 ctdb/include/internal/cmdline.h |  2 +-
 ctdb/tcp/tcp_connect.c          |  2 ++
 source3/wscript_build           | 11 ++++++++++-
 4 files changed, 13 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml
index 558e534..7a3844b 100644
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -455,17 +455,6 @@
       </varlistentry>
 
       <varlistentry>
-	<term>--syslog</term>
-	<listitem>
-	  <para>
-	    Send log messages to syslog instead of the CTDB logfile.
-	    This option overrides --logfile.  The default is to log to
-	    a file.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
 	<term>--transport=tcp|infiniband</term>
 	<listitem>
 	  <para>
diff --git a/ctdb/include/internal/cmdline.h b/ctdb/include/internal/cmdline.h
index 67704c6..d8847a8 100644
--- a/ctdb/include/internal/cmdline.h
+++ b/ctdb/include/internal/cmdline.h
@@ -3,7 +3,7 @@
 
 extern struct poptOption popt_ctdb_cmdline[];
 
-#define POPT_CTDB_CMDLINE { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_ctdb_cmdline, 0, "Common ctdb test options:", NULL },
+#define POPT_CTDB_CMDLINE { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_ctdb_cmdline, 0, "Common ctdb options:", NULL },
 
 struct ctdb_context *ctdb_cmdline_init(struct event_context *ev);
 
diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index b106f22..277eb37 100644
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -338,6 +338,8 @@ static int ctdb_tcp_listen_automatic(struct ctdb_context *ctdb)
 			DEBUG(DEBUG_ERR,(__location__ " Failed to bind() to socket. %s(%d)\n",
 					strerror(errno), errno));
 		}
+
+		close(ctcp->listen_fd);
 	}
 
 	if (i == ctdb->num_nodes) {
diff --git a/source3/wscript_build b/source3/wscript_build
index f6351bf..48fb144 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -171,7 +171,16 @@ bld.SAMBA3_SUBSYSTEM('param',
                    lib/sharesec.c
                    lib/ldap_debug_handler.c
                    lib/util_names.c''',
-                   deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local.h param_global.h cups''')
+                   deps='''samba-util
+                   PARAM_UTIL
+                   ldap
+                   lber
+                   LOADPARM_CTX
+                   samba3core
+                   smbconf
+                   param_local.h
+                   param_global.h
+                   cups''')
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts


-- 
Samba Shared Repository