diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-04-11 14:24:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:12 -0500 |
| commit | 491ce98cc4b794f5c23eabc88004e9540c011fd5 (patch) | |
| tree | 733664f2585eef6f356d8d1cccf7d940cc2d911b /source4 | |
| parent | a7efe6c1c322467b8468399bec7ee294aeaeada8 (diff) | |
| download | samba-491ce98cc4b794f5c23eabc88004e9540c011fd5.tar.gz samba-491ce98cc4b794f5c23eabc88004e9540c011fd5.tar.bz2 samba-491ce98cc4b794f5c23eabc88004e9540c011fd5.zip | |
r162: Minor bugfixes:
- Don't keep windows open after errors
- Don't build ldb backend by default
(This used to be commit 1bb64782c6585c02b8792d23b97d3da60aac844c)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/registry/config.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/registry/tools/gregedit.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4 index 90dc50728b..c00b7cc507 100644 --- a/source4/lib/registry/config.m4 +++ b/source4/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/source4/lib/registry/tools/gregedit.c b/source4/lib/registry/tools/gregedit.c index b62fd7ec04..2d145e699a 100644 --- a/source4/lib/registry/tools/gregedit.c +++ b/source4/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, ®istry); 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, ®istry); if(!W_ERROR_IS_OK(error)) { gtk_show_werror(error); - return; + break; } free(location); free(credentials); registry_load_root(); |