Changeset 988 for vendor/current/libcli/echo

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/libcli/echo

Files:

• echo.c (modified) (5 diffs)
• tests/echo.c (modified) (1 diff)
• tests/wscript_build (modified) (1 diff)
• wscript_build (modified) (1 diff)

vendor/current/libcli/echo/echo.c

@@ -76 +76 @@
                                                 &local_addr);
         if (ret != 0) {
-                tevent_req_nterror(req, map_nt_error_from_unix(ret));
+                tevent_req_nterror(req, map_nt_error_from_unix_common(ret));
                 return tevent_req_post(req, ev);
         }
@@ -83 +83 @@
                                                 ECHO_PORT, &server_addr);
         if (ret != 0) {
-                tevent_req_nterror(req, map_nt_error_from_unix(ret));
+                tevent_req_nterror(req, map_nt_error_from_unix_common(ret));
                 return tevent_req_post(req, ev);
         }
@@ -89 +89 @@
         ret = tdgram_inet_udp_socket(local_addr, server_addr, state, &dgram);
         if (ret != 0) {
-                tevent_req_nterror(req, map_nt_error_from_unix(ret));
+                tevent_req_nterror(req, map_nt_error_from_unix_common(ret));
                 return tevent_req_post(req, ev);
         }
@@ -133 +133 @@
 
         if (len == -1 && err != 0) {
-                tevent_req_nterror(req, map_nt_error_from_unix(err));
+                tevent_req_nterror(req, map_nt_error_from_unix_common(err));
                 return;
         }
@@ -169 +169 @@
 
         if (len == -1 && err != 0) {
-                tevent_req_nterror(req, map_nt_error_from_unix(err));
+                tevent_req_nterror(req, map_nt_error_from_unix_common(err));
+                return;
+        }
+
+        if (len != state->orig_len) {
+                tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
                 return;
         }

vendor/current/libcli/echo/tests/echo.c

@@ -65 +65 @@
         make_nbt_name_server(&name,
                              torture_setting_string(tctx, "host", NULL));
-        status = resolve_name(lpcfg_resolve_context(tctx->lp_ctx), &name, tctx,
-                              &address, tctx->ev);
+        status = resolve_name_ex(lpcfg_resolve_context(tctx->lp_ctx),
+                                 0, 0,
+                                 &name, tctx,
+                                 &address, tctx->ev);
         if (!NT_STATUS_IS_OK(status)) {
                 printf("Failed to resolve %s - %s\n", name.name,

vendor/current/libcli/echo/tests/wscript_build

@@ -5 +5 @@
         subsystem='smbtorture',
         init_function='torture_libcli_echo_init',
-        deps='LIBTSOCKET UTIL_TEVENT LIBCLI_ECHO',
+        deps='LIBTSOCKET tevent-util LIBCLI_ECHO',
         internal_module=True);

vendor/current/libcli/echo/wscript_build

@@ -3 +3 @@
 bld.SAMBA_SUBSYSTEM('LIBCLI_ECHO',
         source='echo.c',
-        deps='LIBTSOCKET UTIL_TEVENT');
+        deps='LIBTSOCKET tevent-util');
 
 bld.RECURSE('tests')