diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 12:39:34 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-06 12:59:49 +1000 |
| commit | 68e0b262be33a1e25018a2afa1e1280ecc5a96eb (patch) | |
| tree | 6ed37299ba935e2c669ee917660043cf0ce70a94 /libgpo/gpo_util.c | |
| parent | c1f8a743201746ccbcd1af5e6f410b2b922c00ba (diff) | |
| download | samba-68e0b262be33a1e25018a2afa1e1280ecc5a96eb.tar.gz | |
build: Remove _SAMBA_BUILD == 4 from libgpo
This code has no hope of building against the samba4 libs (it has been
disabled for a very long time, and files referenced don't exist etc),
and with the common build there simply is no need.
Andrew Bartlett
Diffstat (limited to 'libgpo/gpo_util.c')
| -rw-r--r-- | libgpo/gpo_util.c | 14 |
1 files changed, 0 insertions, 14 deletions
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; } |