Fix the mess with ldb includes.

[metze/samba/wip.git] / source4 / lib / ldb / tools / ldbrename.c

diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c
index 4b3b27c130078fdd765c1809b48ef34e68da6db1..01ed3d98358248891a089f2caaa5e5ddb2fb9b9b 100644 (file)
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -11,7 +11,7 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,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/>.
 */
 
 /*
@@ -34,14 +33,8 @@
  *  Author: Stefan Metzmacher
  */
 
-#include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
-#include "ldb/tools/cmdline.h"
-
-#ifdef _SAMBA_BUILD_
-#include "system/filesys.h"
-#endif
+#include "ldb.h"
+#include "tools/cmdline.h"
 
 static void usage(void)
 {
@@ -56,14 +49,14 @@ static void usage(void)
 }
 
 
- int main(int argc, const char **argv)
+int main(int argc, const char **argv)
 {
        struct ldb_context *ldb;
        int ret;
        struct ldb_cmdline *options;
-       const struct ldb_dn *dn1, *dn2;
+       struct ldb_dn *dn1, *dn2;
 
-       ldb = ldb_init(NULL);
+       ldb = ldb_init(NULL, NULL);
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 
@@ -71,8 +64,17 @@ static void usage(void)
                usage();
        }
 
-       dn1 = ldb_dn_explode(ldb, options->argv[0]);
-       dn2 = ldb_dn_explode(ldb, options->argv[1]);
+       dn1 = ldb_dn_new(ldb, ldb, options->argv[0]);
+       dn2 = ldb_dn_new(ldb, ldb, options->argv[1]);
+
+       if ( ! ldb_dn_validate(dn1)) {
+               printf("Invalid DN1: %s\n", options->argv[0]);
+               return -1;
+       }
+       if ( ! ldb_dn_validate(dn2)) {
+               printf("Invalid DN2: %s\n", options->argv[1]);
+               return -1;
+       }
 
        ret = ldb_rename(ldb, dn1, dn2);
        if (ret == 0) {