The Samba-Bugzilla – Attachment 12919 Details for
Bug 12543
classicupgrade fails without ntvfs due to use_xattrs mixup
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for 4.6
0001-samba-tool-Correct-handling-of-default-value-for-use.patch (text/plain), 3.18 KB, created by
Andrew Bartlett
on 2017-02-13 08:17:12 UTC
(
hide
)
Description:
patch for 4.6
Filename:
MIME Type:
Creator:
Andrew Bartlett
Created:
2017-02-13 08:17:12 UTC
Size:
3.18 KB
patch
obsolete
>From 79a50227bf916c280d48da39de37b2c136a67f74 Mon Sep 17 00:00:00 2001 >From: Andrew Bartlett <abartlet@samba.org> >Date: Mon, 30 Jan 2017 15:34:09 +1300 >Subject: [PATCH] samba-tool: Correct handling of default value for use_ntvfs > and use_xattrs > >Because these options are optional based on build-time rules, we need to encode the >default value from the additonal Option() blocks in the run() declaration. > >Then we can correctly check only for the expected options, and not inconsistently for >None (causing classicupgrade to fail). > >BUG: https://bugzilla.samba.org/show_bug.cgi?id=12543 >Signed-off-by: Andrew Bartlett <abartlet@samba.org> >Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >Reviewed-by: Garming Sam <garming@catalyst.net.nz> >(cherry picked from commit ca961e6a62987dc75931b7714d94fb998d586888) >--- > python/samba/netcmd/domain.py | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > >diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py >index 9661828..b4081e6 100644 >--- a/python/samba/netcmd/domain.py >+++ b/python/samba/netcmd/domain.py >@@ -298,9 +298,9 @@ class cmd_domain_provision(Command): > partitions_only=None, > targetdir=None, > ol_mmr_urls=None, >- use_xattrs=None, >+ use_xattrs="auto", > slapd_path=None, >- use_ntvfs=None, >+ use_ntvfs=False, > use_rfc2307=None, > ldap_backend_nosync=None, > ldap_backend_extra_port=None, >@@ -413,9 +413,9 @@ class cmd_domain_provision(Command): > > if use_xattrs == "yes": > eadb = False >- elif use_xattrs == "auto" and use_ntvfs == False or use_ntvfs == None: >+ elif use_xattrs == "auto" and use_ntvfs == False: > eadb = False >- elif use_ntvfs == False or use_ntvfs == None: >+ elif use_ntvfs == False: > raise CommandError("--use-xattrs=no requires --use-ntvfs (not supported for production use). " > "Please re-run with --use-xattrs omitted.") > elif use_xattrs == "auto" and not lp.get("posix:eadb"): >@@ -1491,7 +1491,7 @@ class cmd_domain_classicupgrade(Command): > takes_args = ["smbconf"] > > def run(self, smbconf=None, targetdir=None, dbdir=None, testparm=None, >- quiet=False, verbose=False, use_xattrs=None, sambaopts=None, versionopts=None, >+ quiet=False, verbose=False, use_xattrs="auto", sambaopts=None, versionopts=None, > dns_backend=None, use_ntvfs=False): > > if not os.path.exists(smbconf): >@@ -1532,9 +1532,9 @@ class cmd_domain_classicupgrade(Command): > eadb = True > if use_xattrs == "yes": > eadb = False >- elif use_xattrs == "auto" and use_ntvfs == False or use_ntvfs == None: >+ elif use_xattrs == "auto" and use_ntvfs == False: > eadb = False >- elif use_ntvfs == False or use_ntvfs == None: >+ elif use_ntvfs == False: > raise CommandError("--use-xattrs=no requires --use-ntvfs (not supported for production use). " > "Please re-run with --use-xattrs omitted.") > elif use_xattrs == "auto" and not s3conf.get("posix:eadb"): >-- >2.9.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
metze
:
review+
Actions:
View
Attachments on
bug 12543
:
12861
| 12919