From 171da4d78736730557a94b44af9f2d62081b80ba Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Jan 2000 06:55:36 +0000 Subject: 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) --- source3/rpcclient/rpcclient.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 2931356334..6dc3cdb25b 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -30,7 +30,6 @@ #endif extern pstring debugf; -extern pstring scope; extern pstring global_myname; extern pstring user_socket_options; @@ -71,8 +70,8 @@ static BOOL rpcclient_connect(struct client_info *info) struct nmb_name calling; struct nmb_name called; - make_nmb_name(&called , dns_to_netbios_name(info->dest_host ), info->name_type, scope); - make_nmb_name(&calling, dns_to_netbios_name(info->myhostname), 0x0 , scope); + make_nmb_name(&called , dns_to_netbios_name(info->dest_host ), info->name_type); + make_nmb_name(&calling, dns_to_netbios_name(info->myhostname), 0x0 ); if (!cli_establish_connection(smb_cli, info->dest_host, &info->dest_ip, @@ -573,7 +572,9 @@ enum client_action case 'i': { - pstrcpy(scope, optarg); + extern pstring global_scope; + pstrcpy(global_scope, optarg); + strupper(global_scope); break; } -- cgit