diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-01-07 06:55:36 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-01-07 06:55:36 +0000 |
| commit | 171da4d78736730557a94b44af9f2d62081b80ba (patch) | |
| tree | ad74341f9d50a521baec09c65637b81b150a0891 /source3/client/smbmount.c | |
| parent | 102e44e446035bdcc7611b8b556d0e20978fbb80 (diff) | |
| download | samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.gz samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.bz2 samba-171da4d78736730557a94b44af9f2d62081b80ba.zip | |
this looks like a big commit, but it isn't really :)
This fixes our netbios scope handling. We now have a 'netbios scope' option
in smb.conf and the scope option is removed from make_nmb_name()
this was prompted by a bug in our PDC finding code where it didn't append
the scope to the query of the '*' name.
(This used to be commit b563be824b8c3141c49558eced7829b48d4ab26f)
Diffstat (limited to 'source3/client/smbmount.c')
| -rw-r--r-- | source3/client/smbmount.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c index e25efcaf56..18af824c1f 100644 --- a/source3/client/smbmount.c +++ b/source3/client/smbmount.c @@ -37,7 +37,6 @@ extern struct in_addr ipzero; extern int DEBUGLEVEL; -extern pstring scope; extern BOOL in_client; extern pstring user_socket_options; @@ -142,8 +141,8 @@ static struct cli_state *do_connection(char *service) ip = ipzero; - make_nmb_name(&calling, my_netbios_name, 0x0, ""); - make_nmb_name(&called , server, 0x20, ""); + make_nmb_name(&calling, my_netbios_name, 0x0); + make_nmb_name(&called , server, 0x20); again: ip = ipzero; @@ -160,7 +159,7 @@ static struct cli_state *do_connection(char *service) fprintf(stderr, "session request to %s failed\n", called.name); cli_shutdown(c); if (strcmp(called.name, "*SMBSERVER")) { - make_nmb_name(&called , "*SMBSERVER", 0x20, ""); + make_nmb_name(&called , "*SMBSERVER", 0x20); goto again; } return NULL; @@ -517,6 +516,7 @@ static void parse_mount_smb(int argc, char **argv) char *opteq; extern char *optarg; int val; + extern pstring global_scope; if (argc < 2 || argv[1][0] == '-') { usage(); @@ -591,7 +591,7 @@ static void parse_mount_smb(int argc, char **argv) } else if(!strcmp(opts, "sockopt")) { pstrcpy(user_socket_options,opteq+1); } else if(!strcmp(opts, "scope")) { - pstrcpy(scope,opteq+1); + pstrcpy(global_scope,opteq+1); } else { usage(); exit(1); |