diff options
| author | Simo Sorce <idra@samba.org> | 2004-09-27 15:40:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:24 -0500 |
| commit | eac532ee3af95654b62d4db57feea0df6abab345 (patch) | |
| tree | 8bd7353424e793dc4e4a5e86feff95ef480b7e99 /source4/libcli | |
| parent | 250996aa5a094cb9d203e2d2e369f6e6eab4cd9c (diff) | |
| download | samba-eac532ee3af95654b62d4db57feea0df6abab345.tar.gz samba-eac532ee3af95654b62d4db57feea0df6abab345.tar.bz2 samba-eac532ee3af95654b62d4db57feea0df6abab345.zip | |
r2695: revert "Del" renaming
(This used to be commit ddd74dae8efe4e04b5a56ee9ecd9d4f87f99d104)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/ldap/ldap.c | 26 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap.h | 10 | ||||
| -rw-r--r-- | source4/libcli/ldap/ldap_ldif.c | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c index 12842b4dc4..af21962265 100644 --- a/source4/libcli/ldap/ldap.c +++ b/source4/libcli/ldap/ldap.c @@ -547,16 +547,16 @@ BOOL ldap_encode(struct ldap_message *msg, DATA_BLOB *result) ldap_encode_response(msg->type, r, &data); break; } - case LDAP_TAG_DeleteRequest: { - struct ldap_DeleteRequest *r = &msg->r.DeleteRequest; + case LDAP_TAG_DelRequest: { + struct ldap_DelRequest *r = &msg->r.DelRequest; asn1_push_tag(&data, - ASN1_APPLICATION_SIMPLE(LDAP_TAG_DeleteRequest)); + ASN1_APPLICATION_SIMPLE(LDAP_TAG_DelRequest)); asn1_write(&data, r->dn, strlen(r->dn)); asn1_pop_tag(&data); break; } - case LDAP_TAG_DeleteResponse: { - struct ldap_Result *r = &msg->r.DeleteResponse; + case LDAP_TAG_DelResponse: { + struct ldap_Result *r = &msg->r.DelResponse; ldap_encode_response(msg->type, r, &data); break; } @@ -1009,13 +1009,13 @@ BOOL ldap_decode(ASN1_DATA *data, struct ldap_message *msg) break; } - case ASN1_APPLICATION_SIMPLE(LDAP_TAG_DeleteRequest): { - struct ldap_DeleteRequest *r = &msg->r.DeleteRequest; + case ASN1_APPLICATION_SIMPLE(LDAP_TAG_DelRequest): { + struct ldap_DelRequest *r = &msg->r.DelRequest; int len; char *dn; - msg->type = LDAP_TAG_DeleteRequest; + msg->type = LDAP_TAG_DelRequest; asn1_start_tag(data, - ASN1_APPLICATION_SIMPLE(LDAP_TAG_DeleteRequest)); + ASN1_APPLICATION_SIMPLE(LDAP_TAG_DelRequest)); len = asn1_tag_remaining(data); dn = talloc(msg->mem_ctx, len+1); if (dn == NULL) @@ -1027,11 +1027,11 @@ BOOL ldap_decode(ASN1_DATA *data, struct ldap_message *msg) break; } - case ASN1_APPLICATION(LDAP_TAG_DeleteResponse): { - struct ldap_Result *r = &msg->r.DeleteResponse; - msg->type = LDAP_TAG_DeleteResponse; + case ASN1_APPLICATION(LDAP_TAG_DelResponse): { + struct ldap_Result *r = &msg->r.DelResponse; + msg->type = LDAP_TAG_DelResponse; ldap_decode_response(msg->mem_ctx, data, - LDAP_TAG_DeleteResponse, r); + LDAP_TAG_DelResponse, r); break; } diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h index cda065ce6e..ca546e11e1 100644 --- a/source4/libcli/ldap/ldap.h +++ b/source4/libcli/ldap/ldap.h @@ -33,8 +33,8 @@ enum ldap_request_tag { LDAP_TAG_ModifyResponse = 7, LDAP_TAG_AddRequest = 8, LDAP_TAG_AddResponse = 9, - LDAP_TAG_DeleteRequest = 10, - LDAP_TAG_DeleteResponse = 11, + LDAP_TAG_DelRequest = 10, + LDAP_TAG_DelResponse = 11, LDAP_TAG_ModifyDNRequest = 12, LDAP_TAG_ModifyDNResponse = 13, LDAP_TAG_CompareRequest = 14, @@ -155,7 +155,7 @@ struct ldap_AddRequest { struct ldap_attribute *attributes; }; -struct ldap_DeleteRequest { +struct ldap_DelRequest { const char *dn; }; @@ -199,8 +199,8 @@ union ldap_Request { struct ldap_Result ModifyResponse; struct ldap_AddRequest AddRequest; struct ldap_Result AddResponse; - struct ldap_DeleteRequest DeleteRequest; - struct ldap_Result DeleteResponse; + struct ldap_DelRequest DelRequest; + struct ldap_Result DelResponse; struct ldap_ModifyDNRequest ModifyDNRequest; struct ldap_Result ModifyDNResponse; struct ldap_CompareRequest CompareRequest; diff --git a/source4/libcli/ldap/ldap_ldif.c b/source4/libcli/ldap/ldap_ldif.c index 8530a60a29..8fe50b6d08 100644 --- a/source4/libcli/ldap/ldap_ldif.c +++ b/source4/libcli/ldap/ldap_ldif.c @@ -352,8 +352,8 @@ static struct ldap_message *ldif_read(int (*fgetc_fn)(void *), } if (strequal(value.data, "delete")) { - msg->type = LDAP_TAG_DeleteRequest; - msg->r.DeleteRequest.dn = dn; + msg->type = LDAP_TAG_DelRequest; + msg->r.DelRequest.dn = dn; return msg; } |