diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-14 13:24:07 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-14 13:24:07 -0700 |
| commit | 5464ce6df678a6ce3022f4a30fd9553996cefb69 (patch) | |
| tree | 86982aa8eda44b0de296f46171fdebb9a4be8597 /source4/scripting/python | |
| parent | 72fcc6344f1ddfece4dd41790fc1add9c6d2c0f7 (diff) | |
| parent | 3dd404abad878fa7e760ba50ce84fc80b82ea159 (diff) | |
| download | samba-5464ce6df678a6ce3022f4a30fd9553996cefb69.tar.gz samba-5464ce6df678a6ce3022f4a30fd9553996cefb69.tar.bz2 samba-5464ce6df678a6ce3022f4a30fd9553996cefb69.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 19149e92e2..e21a3cbee1 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1040,10 +1040,14 @@ def provision(setup_dir, message, session_info, if domainsid is None: domainsid = security.random_sid() + # create/adapt the group policy GUIDs if policyguid is None: policyguid = str(uuid.uuid4()) + policyguid = policyguid.upper() if policyguid_dc is None: policyguid_dc = str(uuid.uuid4()) + policyguid_dc = policyguid_dc.upper() + if adminpass is None: adminpass = glue.generate_random_str(12) if krbtgtpass is None: @@ -1191,16 +1195,16 @@ def provision(setup_dir, message, session_info, os.makedirs(policy_path, 0755) open(os.path.join(policy_path, "GPT.INI"), 'w').write( "[General]\r\nVersion=65544") - os.makedirs(os.path.join(policy_path, "Machine"), 0755) - os.makedirs(os.path.join(policy_path, "User"), 0755) + os.makedirs(os.path.join(policy_path, "MACHINE"), 0755) + os.makedirs(os.path.join(policy_path, "USER"), 0755) policy_path_dc = os.path.join(paths.sysvol, names.dnsdomain, "Policies", "{" + policyguid_dc + "}") os.makedirs(policy_path_dc, 0755) open(os.path.join(policy_path_dc, "GPT.INI"), 'w').write( "[General]\r\nVersion=2") - os.makedirs(os.path.join(policy_path_dc, "Machine"), 0755) - os.makedirs(os.path.join(policy_path_dc, "User"), 0755) + os.makedirs(os.path.join(policy_path_dc, "MACHINE"), 0755) + os.makedirs(os.path.join(policy_path_dc, "USER"), 0755) if not os.path.isdir(paths.netlogon): os.makedirs(paths.netlogon, 0755) |