[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  6178c17... Added control copying for message types other than ldb_search.
      from  da8aba5... s3/docs: Add "max protocol = smb2" to man smb.conf.

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


- Log -----------------------------------------------------------------
commit 6178c17e09a5aed968dac49b16ed0b59750aef1c
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Wed Nov 18 18:47:29 2009 +0200

    Added control copying for message types other than ldb_search.
    
    When ildap created a new message to forward, it only copied controls for ldb_search
    requests. This caused controls for add and modify to be lost in transition
    and tests for them could not be implemented.

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

Summary of changes:
 source4/lib/ldb/ldb_ildap/ldb_ildap.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 061238b..53257a1 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -513,6 +513,7 @@ static int ildb_add(struct ildb_context *ac)
 	for (i = 0; i < n; i++) {
 		msg->r.AddRequest.attributes[i] = mods[i]->attrib;
 	}
+	msg->controls = req->controls;
 
 	return ildb_request_send(ac, msg);
 }
@@ -556,7 +557,7 @@ static int ildb_modify(struct ildb_context *ac)
 	for (i = 0; i < n; i++) {
 		msg->r.ModifyRequest.mods[i] = *mods[i];
 	}
-
+	msg->controls = req->controls;
 	return ildb_request_send(ac, msg);
 }
 
@@ -580,6 +581,7 @@ static int ildb_delete(struct ildb_context *ac)
 		talloc_free(msg);
 		return LDB_ERR_INVALID_DN_SYNTAX;
 	}
+	msg->controls = req->controls;
 
 	return ildb_request_send(ac, msg);
 }
@@ -629,6 +631,7 @@ static int ildb_rename(struct ildb_context *ac)
 	}
 
 	msg->r.ModifyDNRequest.deleteolddn = true;
+	msg->controls = req->controls;
 
 	return ildb_request_send(ac, msg);
 }


-- 
Samba Shared Repository