sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

python/samba/provision: Fix urllib.quote usage for py2/py3

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power
2018-05-04 11:41:11 +01:00
committed by Andrew Bartlett
parent 9410cea310
commit a0cd47fdf8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/provision/__init__.py
View File

@ -26,6 +26,7 @@
__docformat__ = "restructuredText" __docformat__ = "restructuredText"
from samba.compat import urllib_quote
from base64 import b64encode from base64 import b64encode
import errno import errno
import os import os
@ -37,7 +38,6 @@ import logging
import time import time
import uuid import uuid
import socket import socket
import urllib
import string import string
import tempfile import tempfile
import samba.dsdb import samba.dsdb
@ -2189,7 +2189,7 @@ def provision(logger, session_info, smbconf=None,
if paths.sysvol and not os.path.exists(paths.sysvol): if paths.sysvol and not os.path.exists(paths.sysvol):
os.makedirs(paths.sysvol, 0o775) os.makedirs(paths.sysvol, 0o775)
ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="") ldapi_url = "ldapi://%s" % urllib_quote(paths.s4_ldapi_path, safe="")
schema = Schema(domainsid, invocationid=invocationid, schema = Schema(domainsid, invocationid=invocationid,
schemadn=names.schemadn, base_schema=base_schema) schemadn=names.schemadn, base_schema=base_schema)

3
python/samba/provision/backend.py
View File

@ -25,6 +25,7 @@
"""Functions for setting up a Samba configuration (LDB and LDAP backends).""" """Functions for setting up a Samba configuration (LDB and LDAP backends)."""
from samba.compat import urllib_quote
from base64 import b64encode from base64 import b64encode
import errno import errno
import ldb import ldb
@ -183,7 +184,7 @@ class LDAPBackend(ProvisionBackend):
if ldap_backend_forced_uri is not None: if ldap_backend_forced_uri is not None:
self.ldap_uri = ldap_backend_forced_uri self.ldap_uri = ldap_backend_forced_uri
else: else:
self.ldap_uri = "ldapi://%s" % urllib.quote( self.ldap_uri = "ldapi://%s" % urllib_quote(
os.path.join(self.ldapdir, "ldapi"), safe="") os.path.join(self.ldapdir, "ldapi"), safe="")
if not os.path.exists(self.ldapdir): if not os.path.exists(self.ldapdir):