Changeset 988 for vendor/current/source4/echo_server

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/echo_server

Files:

• echo_server.c (modified) (7 diffs)
• wscript_build (modified) (1 diff)

vendor/current/source4/echo_server/echo_server.c

@@ -26 +26 @@
 /* This defines task_server_terminate */
 #include "smbd/process_model.h"
-/* We get load_interfaces from here */
+/* We get load_interface_list from here */
 #include "socket/netif.h"
 /* NTSTATUS-related stuff */
@@ -32 +32 @@
 /* tsocket-related functions */
 #include "lib/tsocket/tsocket.h"
+#include "libds/common/roles.h"
+
+NTSTATUS server_service_echo_init(void);
 
 /* Structure to hold an echo server socket */
@@ -156 +159 @@
         struct echo_udp_call *call = tevent_req_callback_data(subreq,
                                      struct echo_udp_call);
-        ssize_t ret;
         int sys_errno;
 
-        ret = tdgram_sendto_queue_recv(subreq, &sys_errno);
+        tdgram_sendto_queue_recv(subreq, &sys_errno);
 
         /*
@@ -196 +198 @@
                                                 &echo_socket->local_address);
         if (ret != 0) {
-                status = map_nt_error_from_unix(errno);
+                status = map_nt_error_from_unix_common(errno);
                 return status;
         }
@@ -211 +213 @@
                                      &echo_udp_socket->dgram);
         if (ret != 0) {
-                status = map_nt_error_from_unix(errno);
+                status = map_nt_error_from_unix_common(errno);
                 DEBUG(0, ("Failed to bind to %s:%u UDP - %s\n",
                           address, port, nt_errstr(status)));
@@ -264 +266 @@
         model_ops = process_model_startup("single");
         if (model_ops == NULL) {
-                DEBUG(0, ("Can't find 'single' proces model_ops\n"));
+                DEBUG(0, ("Can't find 'single' process model_ops\n"));
                 return NT_STATUS_INTERNAL_ERROR;
         }
 
-        num_interfaces = iface_count(ifaces);
+        num_interfaces = iface_list_count(ifaces);
 
         for(i=0; i<num_interfaces; i++) {
-                const char *address = talloc_strdup(tmp_ctx, iface_n_ip(ifaces, i));
+                const char *address = talloc_strdup(tmp_ctx, iface_list_n_ip(ifaces, i));
 
                 status = echo_add_socket(echo, model_ops, "echo", address, ECHO_SERVICE_PORT);
@@ -302 +304 @@
                                       "for domain members", false);
                 return;
-        case ROLE_DOMAIN_CONTROLLER:
+        case ROLE_ACTIVE_DIRECTORY_DC:
                 /* Yes, we want to run the echo server */
                 break;
         }
 
-        load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
-
-        if (iface_count(ifaces) == 0) {
+        load_interface_list(task, task->lp_ctx, &ifaces);
+
+        if (iface_list_count(ifaces) == 0) {
                 task_server_terminate(task,
                                       "echo: No network interfaces configured",

vendor/current/source4/echo_server/wscript_build

@@ -6 +6 @@
         init_function='server_service_echo_init',
         deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET',
-        local_include=False
+        local_include=False,
+        enabled=bld.AD_DC_BUILD_IS_ENABLED()
         )