[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2108-g83dee90

Volker Lendecke vlendec at samba.org
Sun Jun 7 09:49:55 GMT 2009


The branch, master has been updated
       via  83dee900bc50099311c6a4b6bf7a293c3a10d29a (commit)
       via  d8f331778f6f3756becf9f7974cf2e95d3a04525 (commit)
      from  35492ada90f691757f014fcde0353717800d0bd2 (commit)

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


- Log -----------------------------------------------------------------
commit 83dee900bc50099311c6a4b6bf7a293c3a10d29a
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 7 11:45:01 2009 +0200

    Fix syntax of sending a delete request

commit d8f331778f6f3756becf9f7974cf2e95d3a04525
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jun 7 11:44:37 2009 +0200

    req_del and req_abandon are ASN1_APPLICATION_SIMPLE
    
    Ok, ASN1_APPLICATION everywhere was too easy :-)

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

Summary of changes:
 source3/include/tldap.h |    6 ++++--
 source3/lib/tldap.c     |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/tldap.h b/source3/include/tldap.h
index 9ce5c8b..c79a142 100644
--- a/source3/include/tldap.h
+++ b/source3/include/tldap.h
@@ -158,13 +158,15 @@ const char *tldap_err2string(int rc);
 #define TLDAP_RES_MODIFY (7 + 0x60)
 #define TLDAP_REQ_ADD (8 + 0x60)
 #define TLDAP_RES_ADD (9 + 0x60)
-#define TLDAP_REQ_DELETE (10 + 0x60)
+/* ASN1_APPLICATION_SIMPLE instead of ASN1_APPLICATION */
+#define TLDAP_REQ_DELETE (10 + 0x40)
 #define TLDAP_RES_DELETE (11 + 0x60)
 #define TLDAP_REQ_MODDN (12 + 0x60)
 #define TLDAP_RES_MODDN (13 + 0x60)
 #define TLDAP_REQ_COMPARE (14 + 0x60)
 #define TLDAP_RES_COMPARE (15 + 0x60)
-#define TLDAP_REQ_ABANDON (16 + 0x60)
+/* ASN1_APPLICATION_SIMPLE instead of ASN1_APPLICATION */
+#define TLDAP_REQ_ABANDON (16 + 0x40)
 #define TLDAP_RES_SEARCH_REFERENCE (19 + 0x60)
 #define TLDAP_REQ_EXTENDED (23 + 0x60)
 #define TLDAP_RES_EXTENDED (24 + 0x60)
diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 2012441..df86f95 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1538,7 +1538,7 @@ struct tevent_req *tldap_delete_send(TALLOC_CTX *mem_ctx,
 	}
 
 	asn1_push_tag(state->out, TLDAP_REQ_DELETE);
-	asn1_write_OctetString(state->out, dn, strlen(dn));
+	asn1_write(state->out, dn, strlen(dn));
 	asn1_pop_tag(state->out);
 
 	subreq = tldap_msg_send(state, ev, ld, state->id, state->out);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list