[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  fdf4d3e... s4-waf: fixed WINBINDD_SOCKET_DIR for wb_common in s4
       via  540d197... s4-test: we don't need -s set for samba_dnsupdate
       via  43ca57d... s4-dns: use neater python for reading lines
       via  162e7bc... s4-param: set SMB_CONF_PATH when we load a smb.conf
       via  dcf35ab... runcmd: use tevent_re_initialise() to close sockets
      from  8208f8e... s3 i18n: Fix up missing newlines in more pam_winbind translations

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


- Log -----------------------------------------------------------------
commit fdf4d3eed3e1c461f4b8b67f2a563a86aecc0000
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 18:00:47 2010 +1000

    s4-waf: fixed WINBINDD_SOCKET_DIR for wb_common in s4
    
    s4 uses a different path for the socket

commit 540d197e499f1ab6fb27127c18fc9e4fe913393f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 17:18:53 2010 +1000

    s4-test: we don't need -s set for samba_dnsupdate
    
    this is now handled by SMB_CONF_PATH
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>

commit 43ca57d0887495fdbf2e8dd8c7afb9d521f220f3
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 17:18:20 2010 +1000

    s4-dns: use neater python for reading lines
    
    files are line iterators

commit 162e7bc5b4679ab9be66730ea6b36ed3d25f0643
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 17:17:07 2010 +1000

    s4-param: set SMB_CONF_PATH when we load a smb.conf
    
    this is inherited by child python processes, to ensure they get the
    right smb.conf if they don't have one specified. Fixes bug 7301
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>

commit dcf35ab487f9213d4424493257903971ebe3ebbf
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 17:14:33 2010 +1000

    runcmd: use tevent_re_initialise() to close sockets
    
    this ensures that all event fds are closed in the child

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

Summary of changes:
 lib/util/util_runcmd.c                |    4 ++++
 nsswitch/wscript_build                |    2 +-
 selftest/target/Samba4.pm             |    2 +-
 source4/param/loadparm.c              |    6 ++++++
 source4/scripting/bin/samba_dnsupdate |    9 ++-------
 5 files changed, 14 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index 54643d3..d81a0ac 100644
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -160,6 +160,10 @@ struct tevent_req *samba_runcmd_send(TALLOC_CTX *mem_ctx,
 	close(1);
 	close(2);
 
+	/* we want to ensure that all of the network sockets we had
+	   open are closed */
+	tevent_re_initialise(ev);
+
 	/* setup for logging to go to the parents debug log */
 	open("/dev/null", O_RDONLY); /* for stdin */
 	dup2(p1[1], 1);
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index e13b4dc..80f1187 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('LIBWINBIND-CLIENT',
                     source='wb_common.c',
                     deps='replace',
-                    cflags='-DSOCKET_WRAPPER_DISABLE=1'
+                    cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR
                     )
 
 
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 06a5326..4d6bca9 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -585,7 +585,7 @@ sub provision_raw_step1($$)
 	log level = $ctx->{server_loglevel}
 	lanman auth = Yes
 	rndc command = true
-        dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate -s $ctx->{smb_conf} --all-interfaces --use-file=$ctx->{dns_host_file}
+        dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file}
         resolv:host file = $ctx->{dns_host_file}
 ";
 
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 2bee0fb..b7dcd9b 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2571,6 +2571,12 @@ bool lp_load(struct loadparm_context *lp_ctx, const char *filename)
 	   for a missing smb.conf */
 	reload_charcnv(lp_ctx);
 
+	if (bRetval == true) {
+		/* set this up so that any child python tasks will
+		   find the right smb.conf */
+		setenv("SMB_CONF_PATH", filename, 1);
+	}
+
 	return bRetval;
 }
 
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index cebfae2..3fe55e2 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -148,15 +148,12 @@ def check_dns_name(d):
         except IOError:
             return False
         
-        line = dns_file.readline()
-        while line:
-            line = line.rstrip().lstrip()
+        for line in dns_file:
+            line = line.strip()
             if line[0] == "#":
-                line = dns_file.readline()
                 continue
             if line.lower() == str(d).lower():
                 return True
-            line = dns_file.readline()
         return False
 
     try:
@@ -296,5 +293,3 @@ for d in update_list:
 # delete the ccache if we created it
 if ccachename is not None:
     os.unlink(ccachename)
-
-


-- 
Samba Shared Repository