Changeset 370 for branches/samba-3.3.x/source/libsmb/libsmb_dir.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/libsmb/libsmb_dir.c (modified) (3 diffs)

branches/samba-3.3.x/source/libsmb/libsmb_dir.c

@@ -618 +618 @@
                             (resolve_name(server, &rem_ss, 0x1d) ||   /* LMB */
                              resolve_name(server, &rem_ss, 0x1b) )) { /* DMB */
-
+                                /*
+                                 * "server" is actually a workgroup name,
+                                 * not a server. Make this clear.
+                                 */
+                                char *wgroup = server;
                                 fstring buserver;
 
@@ -626 +630 @@
                                  * Get the backup list ...
                                  */
-                                if (!name_status_find(server, 0x20, 0x20,
+                                if (!name_status_find(wgroup, 0, 0,
                                                       &rem_ss, buserver)) {
-
+                                        char addr[INET6_ADDRSTRLEN];
+
+                                        print_sockaddr(addr, sizeof(addr), &rem_ss);
                                         DEBUG(0,("Could not get name of "
-                                                 "local/domain master browser "
-                                                 "for server %s\n", server));
+                                                "local/domain master browser "
+                                                "for workgroup %s fro m"
+                                                "address %s\n",
+                                                wgroup,
+                                                addr));
                                         if (dir) {
                                                 SAFE_FREE(dir->fname);
@@ -664 +673 @@
 
                                 /* Now, list the servers ... */
-                                if (!cli_NetServerEnum(srv->cli, server,
+                                if (!cli_NetServerEnum(srv->cli, wgroup,
                                                        0x0000FFFE, list_fn,
                                                        (void *)dir)) {