r2695: revert "Del" renaming

diff --git a/source/ldap_server/ldap_server.c b/source/ldap_server/ldap_server.c
index b59a884442d0b2a81767d325eea066b992575641..1aaaf8e06610bcf85df9a30d36860add3819c7bb 100644 (file)
--- a/source/ldap_server/ldap_server.c
+++ b/source/ldap_server/ldap_server.c
@@ -330,21 +330,21 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
        return part->ops->Add(part, call, req);
 }
 
-static NTSTATUS ldapsrv_DeleteRequest(struct ldapsrv_call *call)
+static NTSTATUS ldapsrv_DelRequest(struct ldapsrv_call *call)
 {
-       struct ldap_DeleteRequest *req = &call->request.r.DeleteRequest;
+       struct ldap_DelRequest *req = &call->request.r.DelRequest;
        struct ldapsrv_partition *part;
 
-       DEBUG(10, ("DeleteRequest"));
+       DEBUG(10, ("DelRequest"));
        DEBUGADD(10, (" dn: %s", req->dn));
 
        part = ldapsrv_get_partition(call->conn, req->dn);
 
-       if (!part->ops->Delete) {
+       if (!part->ops->Del) {
                return ldapsrv_unwilling(call, 53);
        }
 
-       return part->ops->Delete(part, call, req);
+       return part->ops->Del(part, call, req);
 }
 
 static NTSTATUS ldapsrv_ModifyDNRequest(struct ldapsrv_call *call)
@@ -419,8 +419,8 @@ static NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
                return ldapsrv_ModifyRequest(call);
        case LDAP_TAG_AddRequest:
                return ldapsrv_AddRequest(call);
-       case LDAP_TAG_DeleteRequest:
-               return ldapsrv_DeleteRequest(call);
+       case LDAP_TAG_DelRequest:
+               return ldapsrv_DelRequest(call);
        case LDAP_TAG_ModifyDNRequest:
                return ldapsrv_ModifyDNRequest(call);
        case LDAP_TAG_CompareRequest:

diff --git a/source/ldap_server/ldap_server.h b/source/ldap_server/ldap_server.h
index 591aa3affef1ac753f99c61dc393e5f5fd304a8f..6ae9cb42d3624b31a42e5f6bb96bf2288f2a4254 100644 (file)
--- a/source/ldap_server/ldap_server.h
+++ b/source/ldap_server/ldap_server.h
@@ -82,7 +82,7 @@ struct ldapsrv_partition_ops {
        NTSTATUS (*Search)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_SearchRequest *r);
        NTSTATUS (*Modify)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyRequest *r);
        NTSTATUS (*Add)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_AddRequest *r);
-       NTSTATUS (*Delete)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_DeleteRequest *r);
+       NTSTATUS (*Del)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_DelRequest *r);
        NTSTATUS (*ModifyDN)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_ModifyDNRequest *r);
        NTSTATUS (*Compare)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_CompareRequest *r);
        NTSTATUS (*Abandon)(struct ldapsrv_partition *partition, struct ldapsrv_call *call, struct ldap_AbandonRequest *r);

diff --git a/source/ldap_server/ldap_simple_ldb.c b/source/ldap_server/ldap_simple_ldb.c
index efd56c1cf941ff09d2b0bada88be4def10a72e74..ea3937376ce2bf2f73cc0fe85feabbdf915521b9 100644 (file)
--- a/source/ldap_server/ldap_simple_ldb.c
+++ b/source/ldap_server/ldap_simple_ldb.c
@@ -146,8 +146,8 @@ queue_reply:
        return ldapsrv_queue_reply(call, done_r);
 }
 
-static NTSTATUS sldb_Delete(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
-                                    struct ldap_DeleteRequest *r)
+static NTSTATUS sldb_Del(struct ldapsrv_partition *partition, struct ldapsrv_call *call,
+                                    struct ldap_DelRequest *r)
 {
        struct ldap_Result *delete_result;
        struct ldapsrv_reply *delete_reply;
@@ -155,7 +155,7 @@ static NTSTATUS sldb_Delete(struct ldapsrv_partition *partition, struct ldapsrv_
        struct samdb_context *samdb;
        struct ldb_context *ldb;
 
-       DEBUG(0, ("sldb_Delete: %s\n", r->dn));
+       DEBUG(0, ("sldb_Del: %s\n", r->dn));
 
        samdb = samdb_connect(call);
        ldb = samdb->ldb;
@@ -163,9 +163,9 @@ static NTSTATUS sldb_Delete(struct ldapsrv_partition *partition, struct ldapsrv_
        ldb_set_alloc(ldb, talloc_ldb_alloc, samdb);
        ldb_ret = ldb_delete(ldb, r->dn);
 
-       delete_reply = ldapsrv_init_reply(call, LDAP_TAG_DeleteResponse);
+       delete_reply = ldapsrv_init_reply(call, LDAP_TAG_DelResponse);
 
-       delete_result = &delete_reply->msg.r.DeleteResponse;
+       delete_result = &delete_reply->msg.r.DelResponse;
        delete_result->dn = talloc_steal(delete_reply, r->dn);
 
        if (ldb_ret != 0) {
@@ -190,7 +190,7 @@ static NTSTATUS sldb_Delete(struct ldapsrv_partition *partition, struct ldapsrv_
 
 static const struct ldapsrv_partition_ops sldb_ops = {
        .Search         = sldb_Search,
-       .Delete         = sldb_Delete
+       .Del            = sldb_Del
 };
 
 const struct ldapsrv_partition_ops *ldapsrv_get_sldb_partition_ops(void)

diff --git a/source/libcli/ldap/ldap.c b/source/libcli/ldap/ldap.c
index 12842b4dc4d2fb991c0d9a1a57a4118d16b080a5..af21962265aff110076c2506d7e8f5b66a3f716c 100644 (file)
--- a/source/libcli/ldap/ldap.c
+++ b/source/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/source/libcli/ldap/ldap.h b/source/libcli/ldap/ldap.h
index cda065ce6ed43a4ee8b3341892a63c3c0deaf720..ca546e11e182c8fe831d0452132f3c81001deaf7 100644 (file)
--- a/source/libcli/ldap/ldap.h
+++ b/source/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/source/libcli/ldap/ldap_ldif.c b/source/libcli/ldap/ldap_ldif.c
index 8530a60a29184d1e36f44d7385d63f6505c1930c..8fe50b6d0846082d9e1a82d12fb56d012d5904c2 100644 (file)
--- a/source/libcli/ldap/ldap_ldif.c
+++ b/source/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;
        }