diff options
| author | Günther Deschner <gd@samba.org> | 2013-12-10 18:06:14 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2013-12-12 13:34:50 +0100 |
| commit | c329a6abcc236101665d2453a70375d740b73944 (patch) | |
| tree | 78369280de65adc9c7b4b480d029a7af1287ff18 /libgpo | |
| parent | 67e0eaa1d04c91f17fe8f0e50b446385517625f5 (diff) | |
| download | samba-c329a6abcc236101665d2453a70375d740b73944.tar.gz | |
libgpo: fix segfault in gpo_process_gpo_list().
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'libgpo')
| -rw-r--r-- | libgpo/gpo_util.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index 315105faee8..b38a40ceb62 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -23,7 +23,8 @@ #include "../librpc/gen_ndr/ndr_security.h" #include "../libgpo/gpo.h" #include "../libcli/security/security.h" -#undef strdup +#include "registry.h" +#include "libgpo/gpo_proto.h" #if 0 #define DEFAULT_DOMAIN_POLICY "Default Domain Policy" @@ -549,9 +550,8 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, struct gp_extension *gp_ext = NULL; struct registry_key *root_key = NULL; struct gp_registry_context *reg_ctx = NULL; -#if 0 WERROR werr; -#endif + status = ADS_ERROR_NT(init_gp_extensions(mem_ctx)); if (!ADS_ERR_OK(status)) { return status; @@ -561,8 +561,7 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, if (!gp_ext_list) { return ADS_ERROR_NT(NT_STATUS_DLL_INIT_FAILED); } -/* FIXME Needs to be replaced with new patchfile_preg calls */ -#if 0 + /* get the key here */ if (flags & GPO_LIST_FLAG_MACHINE) { werr = gp_init_reg_ctx(mem_ctx, KEY_HKLM, REG_KEY_WRITE, @@ -577,7 +576,6 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, talloc_free(reg_ctx); return ADS_ERROR_NT(werror_to_ntstatus(werr)); } -#endif root_key = reg_ctx->curr_key; |