[SAMBA 4] Some cosmetic changes for the LDB modules

Some corrections which make the code a bit more readable (no functional changes here)

2 files changed, 12 insertions, 12 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
index 4e28c8a149..9ed06a9130 100644
--- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c
+++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c
@@ -741,15 +741,15 @@ static int la_op_search_callback(struct ldb_request *req,
 			if (ret != LDB_SUCCESS) {
 				return ldb_module_done(ac->req, NULL, NULL, ret);
 			}
-			break;
-		case LDB_RENAME:
-			
+			return ret;
+
+		case LDB_RENAME:	
+			/* start the mod requests chain */
 			ret = la_do_mod_request(ac);
 			if (ret != LDB_SUCCESS) {
 				return ldb_module_done(ac->req, NULL, NULL,
 						       ret);
-			}
-	
+			}	
 			return ret;
 			
 		default:
@@ -759,7 +759,6 @@ static int la_op_search_callback(struct ldb_request *req,
 			return ldb_module_done(ac->req, NULL, NULL,
 						LDB_ERR_OPERATIONS_ERROR);
 		}
-		return LDB_SUCCESS;
 	}
 
 	talloc_free(ares);
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index ef641ac18b..c7fa636aa8 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1400,33 +1400,33 @@ static int setup_password_fields(struct setup_password_fields_io *io)
 		}
 
 		ret = setup_kerberos_keys(io);
-		if (ret != 0) {
+		if (ret != LDB_SUCCESS) {
 			return ret;
 		}
 	}
 
 	ret = setup_nt_fields(io);
-	if (ret != 0) {
+	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
 	ret = setup_lm_fields(io);
-	if (ret != 0) {
+	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
 	ret = setup_supplemental_field(io);
-	if (ret != 0) {
+	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
 	ret = setup_last_set_field(io);
-	if (ret != 0) {
+	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
 	ret = setup_kvno_field(io);
-	if (ret != 0) {
+	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
@@ -1649,6 +1649,7 @@ static int get_domain_data_callback(struct ldb_request *req,
 		if (ret != LDB_SUCCESS) {
 			return ldb_module_done(ac->req, NULL, NULL, ret);
 		}
+		break;
 
 	case LDB_REPLY_REFERRAL:
 		/* ignore */