diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 18:40:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 18:40:06 +0100 |
| commit | 715cc00bc01e151c10e3d723cd29e126a6464637 (patch) | |
| tree | 538017d459e7531a726e34767c0abcbe5e683faa /source3/lib/smbconf/smbconf_init.c | |
| parent | 293acaf92e7234665e15c3fb7fd600427ffcd5ce (diff) | |
| parent | a868d2f3d5281dea923718486e4e42b20cf8fe74 (diff) | |
| download | samba-715cc00bc01e151c10e3d723cd29e126a6464637.tar.gz samba-715cc00bc01e151c10e3d723cd29e126a6464637.tar.xz samba-715cc00bc01e151c10e3d723cd29e126a6464637.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/smbconf/smbconf_init.c')
| -rw-r--r-- | source3/lib/smbconf/smbconf_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/lib/smbconf/smbconf_init.c b/source3/lib/smbconf/smbconf_init.c index a362a663af..58bb9d9362 100644 --- a/source3/lib/smbconf/smbconf_init.c +++ b/source3/lib/smbconf/smbconf_init.c @@ -18,7 +18,9 @@ */ #include "includes.h" -#include "smbconf_private.h" +#include "lib/smbconf/smbconf_private.h" +#include "lib/smbconf/smbconf_txt.h" +#include "lib/smbconf/smbconf_reg.h" /** * smbconf initialization dispatcher @@ -88,6 +90,6 @@ WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx, } done: - TALLOC_FREE(tmp_ctx); + talloc_free(tmp_ctx); return werr; } |