s3-libsmb: Remove use of cli_errstr()

[kai/samba.git] / libgpo / gpo_util.c

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 3320d97b2123ad1cc989f51c90416ba98284e334..ca529f8af6cd37ffa588e43396edc95f063527ef 100644 (file)
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -18,15 +18,11 @@
  */
 #define TALLOC_DEPRECATED 1
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../libgpo/gpo.h"
-#if _SAMBA_BUILD_ == 4
-#include "system/filesys.h"
-#include "auth/auth.h"
-#include <talloc.h>
-#include "source4/libgpo/ads_convenience.h"
-#endif
+#include "../libcli/security/security.h"
 #undef strdup
 
 #if 0
@@ -844,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);
@@ -857,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;
 }