[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Mon Feb 15 02:34:55 MST 2010


The branch, master has been updated
       via  28bd971... s4:provision.c - "provsion_store_self_join" - don't set the realm if it's NULL
      from  05425fc... s4-drs: replace manual checks with dsdb_modify_permissive()

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


- Log -----------------------------------------------------------------
commit 28bd9719e527d4c127df51567636dc71160b4f59
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Feb 15 10:29:47 2010 +0100

    s4:provision.c - "provsion_store_self_join" - don't set the realm if it's NULL
    
    The realm can be NULL when this function is called by "libnet_Join_primary_domain".
    This seems to be a valid value since "libnet_JoinDomain" is allowed to return an
    empty realm if we are not in a ADS domain.

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

Summary of changes:
 source4/param/provision.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/param/provision.c b/source4/param/provision.c
index 920a5d8..9191400 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -280,8 +280,10 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
 			     PyLdb_FromLdbContext(ldb));
 	PyDict_SetItemString(parameters, "domain", 
 			     PyString_FromString(settings->domain_name));
-	PyDict_SetItemString(parameters, "realm", 
-			     PyString_FromString(settings->realm));
+	if (settings->realm != NULL) {
+		PyDict_SetItemString(parameters, "realm",
+				     PyString_FromString(settings->realm));
+	}
 	PyDict_SetItemString(parameters, "machinepass", 
 			     PyString_FromString(settings->machine_password));
 	PyDict_SetItemString(parameters, "netbiosname", 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list