r162: Minor bugfixes:

 - Don't keep windows open after errors
 - Don't build ldb backend by default

diff --git a/source/lib/registry/config.m4 b/source/lib/registry/config.m4
index 90dc50728ba036aa425073f6dd361e120a9d1031..c00b7cc50712dbd0ca4ef5d0ecfad5f3e960484c 100644 (file)
--- a/source/lib/registry/config.m4
+++ b/source/lib/registry/config.m4
@@ -14,6 +14,6 @@ SMB_MODULE(reg_nt4, REG, STATIC, lib/registry/reg_backend_nt4/reg_backend_nt4.o)
 SMB_MODULE(reg_dir, REG, STATIC, lib/registry/reg_backend_dir/reg_backend_dir.o)
 SMB_MODULE(reg_rpc, REG, STATIC, lib/registry/reg_backend_rpc/reg_backend_rpc.o)
 SMB_MODULE(reg_gconf, REG, NOT, lib/registry/reg_backend_gconf/reg_backend_gconf.o, [], [$GCONF_LIBS])
-SMB_MODULE(reg_ldb, REG, STATIC, lib/registry/reg_backend_ldb/reg_backend_ldb.o)
+SMB_MODULE(reg_ldb, REG, NOT, lib/registry/reg_backend_ldb/reg_backend_ldb.o)
 SMB_SUBSYSTEM(REG,lib/registry/common/reg_interface.o,[lib/registry/common/reg_objects.o lib/registry/common/reg_util.o],lib/registry/common/winregistry_proto.h,[])
 AC_CONFIG_FILES(lib/registry/winregistry.pc)

diff --git a/source/lib/registry/tools/gregedit.c b/source/lib/registry/tools/gregedit.c
index b62fd7ec047c8956a5719632c1f93e089438d919..2d145e699a50aeed9f82feaf71ffd1ae2da17d50 100644 (file)
--- a/source/lib/registry/tools/gregedit.c
+++ b/source/lib/registry/tools/gregedit.c
@@ -242,7 +242,6 @@ GtkWidget* create_rpcwin (void)
   return rpcwin;
 }
 
-
 static void on_open_nt4_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
        gint result = gtk_dialog_run(GTK_DIALOG(create_openfilewin()));
@@ -254,7 +253,7 @@ static void on_open_nt4_activate (GtkMenuItem *menuitem, gpointer user_data)
                error = reg_open("nt4", filename, NULL, &registry);
                if(!W_ERROR_IS_OK(error)) {
                        gtk_show_werror(error);
-                       return;
+                       break;
                }
                registry_load_root();
                break;
@@ -291,7 +290,7 @@ on_open_remote_activate                (GtkMenuItem     *menuitem,
                error = reg_open("rpc", location, credentials, &registry);
                if(!W_ERROR_IS_OK(error)) {
                        gtk_show_werror(error);
-                       return;
+                       break;
                }
                free(location); free(credentials);
                registry_load_root();