[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  009b97d provision: fix the doc
       via  8741b90 s4-interfaces: allow pure ipv6 to work
       via  a1767f7 s4: check that the xattr are supported in the folder where we want to provision
      from  e02f951 Removed unused variable.

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


- Log -----------------------------------------------------------------
commit 009b97d6f36eae2b4e8ac1452cb5ebb57dec1b46
Author: Matthieu Patou <mat at matws.net>
Date:   Tue Oct 4 21:06:31 2011 +0200

    provision: fix the doc
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sun Oct 16 01:31:21 CEST 2011 on sn-devel-104

commit 8741b90334a2b9f0143f839e8ff65101d4a70e71
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Oct 15 11:13:40 2011 +0200

    s4-interfaces: allow pure ipv6 to work
    
    This is the complementary part of patch
    abe5afc580dcaaab70f136904d98fa83bfae7b6e for samba4.

commit a1767f74afc0037d188a8ed578ce68a7e3cd07f3
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Oct 14 11:22:20 2011 +0200

    s4: check that the xattr are supported in the folder where we want to provision
    
    By default we were checking this on the default folder for
    tempfile.NamedTemporaryFile (usualy /tmp) but this folder can be mounted
    on tmpfs (which didn't support xattr currently). Now we should check on
    the filesystem where the provision will be done.

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

Summary of changes:
 source4/lib/socket/interface.c                  |    3 ++-
 source4/scripting/python/samba/netcmd/domain.py |    5 ++++-
 source4/setup/provision                         |    8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index 7994716..27ac715 100644
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -87,7 +87,8 @@ static void add_interface(TALLOC_CTX *mem_ctx, const struct iface_struct *ifs, s
 		return;
 	}
 
-	if (!(ifs->flags & (IFF_BROADCAST|IFF_LOOPBACK))) {
+	if (ifs->ip.ss_family == AF_INET &&
+		!(ifs->flags & (IFF_BROADCAST|IFF_LOOPBACK))) {
 		DEBUG(3,("not adding non-broadcast interface %s\n",
 					ifs->name ));
 		return;
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index ce9d7d8..3906d69 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -591,7 +591,10 @@ class cmd_domain_samba3upgrade(Command):
         if use_xattrs == "yes":
             eadb = False
         elif use_xattrs == "auto" and not s3conf.get("posix:eadb"):
-            tmpfile = tempfile.NamedTemporaryFile()
+            if targetdir:
+                tmpfile = tempfile.NamedTemporaryFile(prefix=os.path.abspath(targetdir))
+            else:
+                tmpfile = tempfile.NamedTemporaryFile(prefix=os.path.abspath(os.path.dirname(lp.get("private dir"))))
             try:
                 samba.ntacls.setntacl(lp, tmpfile.name,
                             "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")
diff --git a/source4/setup/provision b/source4/setup/provision
index d05af51..9ddbccf 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -32,6 +32,7 @@ sys.path.insert(0, "bin/python")
 
 import samba
 import samba.ntacls
+import os
 from samba.credentials import DONT_USE_KERBEROS
 from samba.auth import system_session
 import samba.getopt as options
@@ -108,7 +109,7 @@ parser.add_option("--ldap-backend-type", type="choice", metavar="LDAP-BACKEND-TY
 parser.add_option("--ldap-backend-nosync", help="Configure LDAP backend not to call fsync() (for performance in test environments)", action="store_true")
 parser.add_option("--server-role", type="choice", metavar="ROLE",
           choices=["domain controller", "dc", "member server", "member", "standalone"],
-        help="The server role (domain controller | dc | member server | member | standalone). Default is standalone.")
+        help="The server role (domain controller | dc | member server | member | standalone). Default is dc.")
 parser.add_option("--function-level", type="choice", metavar="FOR-FUN-LEVEL",
           choices=["2000", "2003", "2008", "2008_R2"],
         help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2003 Native.")
@@ -226,7 +227,10 @@ eadb = True
 if opts.use_xattrs == "yes":
     eadb = False
 elif opts.use_xattrs == "auto" and not lp.get("posix:eadb"):
-    file = tempfile.NamedTemporaryFile()
+    if opts.targetdir:
+        file = tempfile.NamedTemporaryFile(prefix=os.path.abspath(opts.targetdir))
+    else:
+        file = tempfile.NamedTemporaryFile(prefix=os.path.abspath(os.path.dirname(lp.get("private dir"))))
     try:
         samba.ntacls.setntacl(lp, file.name,
             "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native")


-- 
Samba Shared Repository