X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source3%2Flib%2Fldb%2Ftools%2Fldbedit.c;h=dff7270e5d4b240df8178eae07bc3abd66c5a783;hp=3f9a9c73e8364c3d65eeb4bee5fa6373503d8198;hb=47951fc5d0085e124666b7667715bba98076820e;hpb=2c09988e46d4e917b1c53c9bda3f81a48bba4952

diff --git a/source3/lib/ldb/tools/ldbedit.c b/source3/lib/ldb/tools/ldbedit.c
index 3f9a9c73e83..dff7270e5d4 100644
--- a/source3/lib/ldb/tools/ldbedit.c
+++ b/source3/lib/ldb/tools/ldbedit.c
@@ -18,8 +18,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -307,7 +306,7 @@ int main(int argc, const char **argv)
 		}
 	}
 
-	ret = ldb_search(ldb, basedn, options->scope, expression, attrs, &result);
+	ret = ldb_search(ldb, ldb, &result, basedn, options->scope, attrs, expression);
 	if (ret != LDB_SUCCESS) {
 		printf("search failed - %s\n", ldb_errstring(ldb));
 		exit(1);
@@ -320,12 +319,10 @@ int main(int argc, const char **argv)
 
 	do_edit(ldb, result->msgs, result->count, options->editor);
 
-	if (result) {
-		ret = talloc_free(result);
-		if (ret == -1) {
-			fprintf(stderr, "talloc_free failed\n");
-			exit(1);
-		}
+	ret = talloc_free(result);
+	if (ret == -1) {
+		fprintf(stderr, "talloc_free failed\n");
+		exit(1);
 	}
 
 	talloc_free(ldb);