diff options
| -rw-r--r-- | libgpo/gpext/gpext.c | 2 | ||||
| -rw-r--r-- | libgpo/gpo.h | 4 | ||||
| -rw-r--r-- | libgpo/gpo_fetch.c | 48 | ||||
| -rw-r--r-- | libgpo/gpo_ldap.c | 4 | ||||
| -rw-r--r-- | libgpo/gpo_sec.c | 6 | ||||
| -rw-r--r-- | libgpo/gpo_util.c | 14 |
6 files changed, 0 insertions, 78 deletions
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c index 42ab6223312..1f86b5f5d71 100644 --- a/libgpo/gpext/gpext.c +++ b/libgpo/gpext/gpext.c @@ -23,11 +23,9 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "lib/util/dlinklist.h" #include "../libcli/registry/util_reg.h" -#if _SAMBA_BUILD_ == 3 #include "libgpo/gpo_proto.h" #include "registry.h" #include "registry/reg_api.h" -#endif static struct gp_extension *extensions = NULL; diff --git a/libgpo/gpo.h b/libgpo/gpo.h index e6443825ece..62e9091156e 100644 --- a/libgpo/gpo.h +++ b/libgpo/gpo.h @@ -20,12 +20,8 @@ #ifndef __GPO_H__ #define __GPO_H__ -#if _SAMBA_BUILD_ == 4 -#include "source4/libgpo/ads_convenience.h" -#else struct loadparm_context; #include "ads.h" -#endif enum GPO_LINK_TYPE { GP_LINK_UNKOWN = 0, diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c index cae11d5c0d2..4e895bf544e 100644 --- a/libgpo/gpo_fetch.c +++ b/libgpo/gpo_fetch.c @@ -22,20 +22,8 @@ #include "../libgpo/gpo.h" #include "../libgpo/gpo_ini.h" -#if _SAMBA_BUILD_ == 4 -#include "param/param.h" -#include "libcli/resolve/resolve.h" -#include <tevent.h> -#include "libcli/libcli.h" -#include "libcli/raw/libcliraw.h" -#include "libcli/libcli_proto.h" -#include "libgpo/ads_convenience.h" -#include "libgpo/gpo_s4.h" -#include "lib/util/util.h" -#else #include "libgpo/gpo_proto.h" #include "libsmb/libsmb.h" -#endif /**************************************************************** explode the GPO CIFS URI into their components @@ -82,11 +70,7 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx, file_sys_path)) == NULL) { return NT_STATUS_NO_MEMORY; } -#if _SAMBA_BUILD_ == 4 - path = string_sub_talloc(mem_ctx, path, "\\", "/"); -#else path = talloc_string_sub(mem_ctx, path, "\\", "/"); -#endif if (!path) { return NT_STATUS_NO_MEMORY; } @@ -138,10 +122,8 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_ const char *server, const char *service, void *ret_cli) { NTSTATUS result; -#if _SAMBA_BUILD_ == 3 struct cli_state *cli; - result = cli_full_connection(&cli, lp_netbios_name(), server, @@ -159,32 +141,6 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_ return result; } *(struct cli_state **) ret_cli = cli; -#else - struct smbcli_state *cli = NULL; - struct smbcli_options options; - struct smbcli_session_options session_options; - - lp_smbcli_options(lp_ctx, &options); - lp_smbcli_session_options(lp_ctx, &session_options); - - result = smbcli_full_connection(NULL, &cli, - server, - NULL, service, - NULL /*devtype*/, NULL /* socket options */, - ads->credentials, - lp_resolve_context(lp_ctx), - tevent_context_init(ads), - &options, - &session_options, - lp_iconv_handle(lp_ctx), - lp_gensec_settings(ads, lp_ctx)); - if (!NT_STATUS_IS_OK(result)) { - DEBUG(10,("failed to connect: %s\n", - nt_errstr(result))); - return result; - } - *(struct smbcli_state **) ret_cli = cli; -#endif return NT_STATUS_OK; } @@ -201,11 +157,7 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx, NTSTATUS result; char *server, *service, *nt_path, *unix_path; char *nt_ini_path, *unix_ini_path; -#if _SAMBA_BUILD_ == 3 struct cli_state *cli; -#else - struct smbcli_state *cli; -#endif result = gpo_explode_filesyspath(mem_ctx, cache_dir, gpo->file_sys_path, diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c index 9d984b5b990..d46c48f8f3e 100644 --- a/libgpo/gpo_ldap.c +++ b/libgpo/gpo_ldap.c @@ -20,10 +20,6 @@ #include "includes.h" #include "libgpo/gpo.h" #include "auth.h" -#if _SAMBA_BUILD_ == 4 -#include "libgpo/gpo_s4.h" -#include "source4/libgpo/ads_convenience.h" -#endif #include "../libcli/security/security.h" /**************************************************************** diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c index 05b011b81d3..c27ca55f977 100644 --- a/libgpo/gpo_sec.c +++ b/libgpo/gpo_sec.c @@ -22,12 +22,6 @@ #include "../libgpo/gpo.h" #include "auth.h" #include "../librpc/ndr/libndr.h" -#if _SAMBA_BUILD_ == 4 -#include "libgpo/ads_convenience.h" -#include "librpc/gen_ndr/security.h" -#include "librpc/gen_ndr/ndr_misc.h" -#include "../libcli/security/secace.h" -#endif /**************************************************************** ****************************************************************/ diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index 553402a4274..ca529f8af6c 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -23,11 +23,6 @@ #include "../librpc/gen_ndr/ndr_security.h" #include "../libgpo/gpo.h" #include "../libcli/security/security.h" -#if _SAMBA_BUILD_ == 4 -#include "auth/auth.h" -#include <talloc.h> -#include "source4/libgpo/ads_convenience.h" -#endif #undef strdup #if 0 @@ -845,11 +840,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, { struct security_token *ad_token = NULL; ADS_STATUS status; -#if _SAMBA_BUILD_ == 4 - struct auth_session_info *info; -#else NTSTATUS ntstatus; -#endif #ifndef HAVE_ADS return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED); @@ -858,15 +849,10 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, if (!ADS_ERR_OK(status)) { return status; } -#if _SAMBA_BUILD_ == 4 - info = system_session(mem_ctx, lp_ctx); - *token = info->security_token; -#else ntstatus = merge_nt_token(mem_ctx, ad_token, get_system_token(), token); if (!NT_STATUS_IS_OK(ntstatus)) { return ADS_ERROR_NT(ntstatus); } -#endif return ADS_SUCCESS; } |