diff options
| author | Wilco Baan Hofman <wilco@baanhofman.nl> | 2009-03-01 16:25:57 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-04-20 23:16:16 +0200 |
| commit | 248554370af30f485a4088d0d5de675e77b2aa7b (patch) | |
| tree | dfae2c73ebff165845714a5566a29f257efcc9c4 /libgpo/gpo_util.c | |
| parent | c441b7dda8507b22a94146be0df77e54e623645a (diff) | |
| download | samba-248554370af30f485a4088d0d5de675e77b2aa7b.tar.gz | |
Make gpo_ldap.c compatible with samba 4. Add ads_get_ldap_server_name() function to samba 3. Move prototypes to root libgpo where appropriate.
gpo_ldap.c now compiles for both samba 3 and 4.
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'libgpo/gpo_util.c')
| -rw-r--r-- | libgpo/gpo_util.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index d5e3f24c8df..9bfb353dad0 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -18,7 +18,11 @@ */ #include "includes.h" +#include "librpc/gen_ndr/ndr_misc.h" +#if _SAMBA_BUILD_ == 4 #include "../libgpo/gpo.h" +#include "source4/libgpo/ads_convenience.h" +#endif #undef strdup #define DEFAULT_DOMAIN_POLICY "Default Domain Policy" @@ -601,7 +605,7 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads, done: gp_free_reg_ctx(reg_ctx); - TALLOC_FREE(root_key); + talloc_free(root_key); free_gp_extensions(); return status; @@ -660,7 +664,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads, result = cli_full_connection(&cli, global_myname(), - ads->config.ldap_server_name, + ads_get_ldap_server_name(ads), /* server */ NULL, 0, share, "A:", @@ -834,7 +838,7 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx, path, suffix); NT_STATUS_HAVE_NO_MEMORY(tmp); - if (sys_stat(tmp, &sbuf) == 0) { + if (stat(tmp, &sbuf) == 0) { *filename_out = tmp; return NT_STATUS_OK; } |