]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: libsmb: Cleanup - change to early continue in internal_resolve_name() for 0x1D...
authorJeremy Allison <jra@samba.org>
Mon, 20 Jul 2020 23:59:38 +0000 (16:59 -0700)
committerIsaac Boukris <iboukris@sn-devel-184>
Tue, 4 Aug 2020 08:51:41 +0000 (08:51 +0000)
No logic change.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Isaac Boukris <iboukris@samba.org>
source3/libsmb/namequery.c

index e90392a43ff8082bded1b2723321df50bb66a3b2..37f9f0fa3ddcaa5c23c9d4012ff5553cac92cc26 100644 (file)
@@ -2726,20 +2726,21 @@ NTSTATUS internal_resolve_name(const char *name,
                } else if (strequal(tok, "wins")) {
                        /* don't resolve 1D via WINS */
                        struct sockaddr_storage *ss_list = NULL;
-                       if (name_type != 0x1D) {
-                               status = resolve_wins(name, name_type,
-                                                     talloc_tos(),
-                                                     &ss_list,
-                                                     return_count);
-                               if (NT_STATUS_IS_OK(status)) {
-                                       if (!convert_ss2service(return_iplist,
-                                                               ss_list,
-                                                               return_count)) {
-                                               status = NT_STATUS_NO_MEMORY;
-                                               goto fail;
-                                       }
-                                       goto done;
+                       if (name_type == 0x1D) {
+                               continue;
+                       }
+                       status = resolve_wins(name, name_type,
+                                             talloc_tos(),
+                                             &ss_list,
+                                             return_count);
+                       if (NT_STATUS_IS_OK(status)) {
+                               if (!convert_ss2service(return_iplist,
+                                                       ss_list,
+                                                       return_count)) {
+                                       status = NT_STATUS_NO_MEMORY;
+                                       goto fail;
                                }
+                               goto done;
                        }
                } else if (strequal(tok, "bcast")) {
                        struct sockaddr_storage *ss_list = NULL;