Changeset 988 for vendor/current/libgpo/gpo_fetch.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/libgpo/gpo_fetch.c (modified) (6 diffs)

vendor/current/libgpo/gpo_fetch.c

@@ -23 +23 @@
 #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
 
 /****************************************************************
@@ -83 +71 @@
                 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;
@@ -135 +119 @@
 }
 
-static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context *lp_ctx,
+static NTSTATUS gpo_connect_server(ADS_STRUCT *ads,
                                    const char *server, const char *service, void *ret_cli)
 {
         NTSTATUS result;
-#if _SAMBA_BUILD_ == 3
         struct cli_state *cli;
 
-
         result = cli_full_connection(&cli,
-                        global_myname(),
+                        lp_netbios_name(),
                         server,
                         NULL, 0,
@@ -160 +142 @@
         }
         *(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_convenience(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;
 }
@@ -195 +151 @@
 NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
                          ADS_STRUCT *ads,
-                         struct loadparm_context *lp_ctx,
                          const char *cache_dir,
-                         struct GROUP_POLICY_OBJECT *gpo)
+                         const struct GROUP_POLICY_OBJECT *gpo)
 {
         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
 
 
@@ -214 +165 @@
         NT_STATUS_NOT_OK_RETURN(result);
 
-
-        result = gpo_connect_server(ads, lp_ctx, server, service, &cli);
-        NT_STATUS_NOT_OK_RETURN(result);
-
+        /* for now reuse the existing ds connection */
+
+        result = gpo_connect_server(ads, ads->server.ldap_server, service, &cli);
+        NT_STATUS_NOT_OK_RETURN(result);
 
         result = gpo_prepare_local_store(mem_ctx, cache_dir, unix_path);