From 2cddf134e698e19d07b31ef68b325bc1c7070782 Mon Sep 17 00:00:00 2001 From: "Christopher R. Hertel" Date: Wed, 11 Oct 2000 16:24:20 +0000 Subject: Simple cleanup, but I also changed the value of the dlevel parameter passed to open_socket_in() from within the open_sockets() function. This has some effect on the way port numbers are assigned. Basically, if we use the -r switch we are saying 'use port 137'. If we can't do that, there should be an error message and a failure. If we don't use -r then we simply select the first available port. The way it was working, if we selected -r and port 137 was in use, wierd things would happen as open_socket_in() tried to find another port. (This used to be commit f09cb41ad86b233253758de7ef2781589ac07b86) --- source3/utils/nmblookup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/utils/nmblookup.c') diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index 15188f6768f..2cdd85fae85 100644 --- a/source3/utils/nmblookup.c +++ b/source3/utils/nmblookup.c @@ -34,7 +34,7 @@ static struct in_addr bcast_addr; static BOOL recursion_desired = False; static BOOL translate_addresses = False; static int ServerFD= -1; -static int RootPort = 0; +static int RootPort = False; static BOOL find_status=False; /**************************************************************************** @@ -43,14 +43,14 @@ static BOOL find_status=False; static BOOL open_sockets(void) { ServerFD = open_socket_in( SOCK_DGRAM, - (RootPort ? 137 :0), - 3, + (RootPort ? 137 : 0), + (RootPort ? 0 : 3), interpret_addr(lp_socket_address()), True ); if (ServerFD == -1) return(False); - set_socket_options(ServerFD,"SO_BROADCAST"); + set_socket_options( ServerFD, "SO_BROADCAST" ); DEBUG(3, ("Socket opened.\n")); return True; @@ -200,7 +200,7 @@ int main(int argc,char *argv[]) pstrcpy(servicesf, optarg); break; case 'r': - RootPort = -1; + RootPort = True; break; case 'h': usage(); -- cgit