s4:ldap server - remove unused error handlings
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Tue, 6 Oct 2009 19:53:05 +0000 (21:53 +0200)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Wed, 7 Oct 2009 22:18:06 +0000 (00:18 +0200)
Those error cases should be handled by LDB itself to be available on all
connection methods and not only over LDAP.

source4/ldap_server/ldap_backend.c

index 5f9b8221374d20a7958035681a70dc45b2f0bcb2..f3d82a7bc4b6a53bd1cecc5d1d07975c8b7c78ee 100644 (file)
@@ -534,26 +534,11 @@ static NTSTATUS ldapsrv_ModifyRequest(struct ldapsrv_call *call)
                                NT_STATUS_HAVE_NO_MEMORY(msg->elements[i].values);
 
                                for (j=0; j < msg->elements[i].num_values; j++) {
-                                       if (!(req->mods[i].attrib.values[j].length > 0)) {
-                                               result = LDAP_OTHER;
-
-                                               map_ldb_error(local_ctx,
-                                                       LDB_ERR_OTHER, &errstr);
-                                               errstr = talloc_asprintf(local_ctx,
-                                                       "%s. Empty attribute values not allowed", errstr);
-                                               goto reply;
-                                       }
                                        msg->elements[i].values[j].length = req->mods[i].attrib.values[j].length;
                                        msg->elements[i].values[j].data = req->mods[i].attrib.values[j].data;                   
                                }
                        }
                }
-       } else {
-               result = LDAP_OTHER;
-               map_ldb_error(local_ctx, LDB_ERR_OTHER, &errstr);
-               errstr = talloc_asprintf(local_ctx,
-                       "%s. No mods are not allowed", errstr);
-               goto reply;
        }
 
 reply:
@@ -628,31 +613,11 @@ static NTSTATUS ldapsrv_AddRequest(struct ldapsrv_call *call)
                                NT_STATUS_HAVE_NO_MEMORY(msg->elements[i].values);
 
                                for (j=0; j < msg->elements[i].num_values; j++) {
-                                       if (!(req->attributes[i].values[j].length > 0)) {
-                                               result = LDAP_OTHER;
-                                               map_ldb_error(local_ctx,
-                                                       LDB_ERR_OTHER, &errstr);
-                                               errstr = talloc_asprintf(local_ctx,
-                                                       "%s. Empty attribute values not allowed", errstr);
-                                               goto reply;
-                                       }
                                        msg->elements[i].values[j].length = req->attributes[i].values[j].length;
                                        msg->elements[i].values[j].data = req->attributes[i].values[j].data;                    
                                }
-                       } else {
-                               result = LDAP_OTHER;
-                               map_ldb_error(local_ctx, LDB_ERR_OTHER, &errstr);
-                               errstr = talloc_asprintf(local_ctx,
-                                       "%s. No attribute values are not allowed", errstr);
-                               goto reply;
                        }
                }
-       } else {
-               result = LDAP_OTHER;
-               map_ldb_error(local_ctx, LDB_ERR_OTHER, &errstr);
-               errstr = talloc_asprintf(local_ctx, 
-                       "%s. No attributes are not allowed", errstr);
-               goto reply;
        }
 
 reply: