diff options
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/lib/ldb/wscript | 2 | ||||
| -rwxr-xr-x | source4/scripting/bin/samba_dnsupdate | 8 | ||||
| -rwxr-xr-x | source4/scripting/bin/samba_spnupdate | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index a0b92d57d6..f31f3dd29d 100755 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -252,7 +252,7 @@ def test(ctx): test_prefix = "%s/st" % (Utils.g_module.blddir) shutil.rmtree(test_prefix, ignore_errors=True) os.makedirs(test_prefix) - os.putenv('TEST_DATA_PREFIX', test_prefix) + os.environ['TEST_DATA_PREFIX'] = test_prefix cmd = 'tests/test-tdb.sh' ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index cacdc36194..99f898e204 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -26,13 +26,13 @@ import subprocess # ensure we get messages out immediately, so they get in the samba logs, # and don't get swallowed by a timeout -os.putenv('PYTHONUNBUFFERED', '1') +os.environ['PYTHONUNBUFFERED'] = '1' # forcing GMT avoids a problem in some timezones with kerberos. Both MIT # heimdal can get mutual authentication errors due to the 24 second difference # between UTC and GMT when using some zone files (eg. the PDT zone from # the US) -os.putenv("TZ", "GMT") +os.environ["TZ"] = "GMT" # Find right directory when running from source tree sys.path.insert(0, "bin/python") @@ -259,7 +259,7 @@ def call_nsupdate(d): f.write("send\n") f.close() - os.putenv("KRB5CCNAME", ccachename) + os.environ["KRB5CCNAME"] = ccachename try: cmd = nsupdate_cmd[:] cmd.append(tmpfile) @@ -359,7 +359,7 @@ else: # use our private krb5.conf to avoid problems with the wrong domain # bind9 nsupdate wants the default domain set krb5conf = lp.private_path('krb5.conf') -os.putenv('KRB5_CONFIG', krb5conf) +os.environ['KRB5_CONFIG'] = krb5conf file = open(dns_update_list, "r") diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate index 0dcc9fecfe..169c12ab00 100755 --- a/source4/scripting/bin/samba_spnupdate +++ b/source4/scripting/bin/samba_spnupdate @@ -22,13 +22,13 @@ import os, sys # ensure we get messages out immediately, so they get in the samba logs, # and don't get swallowed by a timeout -os.putenv('PYTHONUNBUFFERED', '1') +os.environ['PYTHONUNBUFFERED'] = '1' # forcing GMT avoids a problem in some timezones with kerberos. Both MIT # heimdal can get mutual authentication errors due to the 24 second difference # between UTC and GMT when using some zone files (eg. the PDT zone from # the US) -os.putenv("TZ", "GMT") +os.environ["TZ"] = "GMT" # Find right directory when running from source tree sys.path.insert(0, "bin/python") |