[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-570-g05653fc

[Nadezhda Ivanova]

The branch, master has been updated
       via  05653fce788d239433a93e68b71c1d280f02161a (commit)
      from  52650f109dd12545db78fb4345d70dc83273b10b (commit)

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


- Log -----------------------------------------------------------------
commit 05653fce788d239433a93e68b71c1d280f02161a
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Fri Sep 18 17:48:26 2009 -0700

    Fixed a difference in domain sid type when SID is provided by user.

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

Summary of changes:
 source4/scripting/python/samba/provision.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 50858b9..fe11b94 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1052,7 +1052,10 @@ def provision(setup_dir, message, session_info,
         return os.path.join(setup_dir, file)
 
     if domainsid is None:
-        domainsid = security.random_sid()
+      domainsid = security.random_sid()
+    else:
+      domainsid = security.dom_sid(domainsid)
+
 
     # create/adapt the group policy GUIDs
     if policyguid is None:


-- 
Samba Shared Repository