------------------------------------------------------------
revno: 13875
revision-id: squid3@treenet.co.nz-20150731201212-mhbuayizc3cb962c
parent: squid3@treenet.co.nz-20150731195129-ilh38md4k4e083m6
author: John M Cooper <john.cooper@yourcommunications.co.uk>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Fri 2015-07-31 13:12:12 -0700
message:
  basic_smb_auth: nmblookup fails when smb.conf contaisn WINS servers
  
   From; John M Cooper
   To; Debian Bug Tracking System
   Subject; squid: smb_auth does not work with a wins server defined in smb.conf
   Date; 28 Jan 2002 17:46:13 +0000
  
  If you define a wins server in the file /etc/samba/smb.conf then the
  smb_auth script gets the wrong Domain Controller IP address.
  
  There should be a change to smb_auth.sh at line 50
  
  basically adding in the extra "\..+" stops the number of Wins servers
  from being returned from the nmblookup command.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150731201212-mhbuayizc3cb962c
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 4e0eb52b71020b0f5e6ec0f990a600936fb11c9e
# timestamp: 2015-07-31 20:51:01 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150731195129-\
#   ilh38md4k4e083m6
# 
# Begin patch
=== modified file 'helpers/basic_auth/SMB/basic_smb_auth.sh'
--- helpers/basic_auth/SMB/basic_smb_auth.sh	2015-01-13 09:13:49 +0000
+++ helpers/basic_auth/SMB/basic_smb_auth.sh	2015-07-31 20:12:12 +0000
@@ -53,7 +53,7 @@
   addropt=""
 fi
 echo "Query address options: $addropt"
-dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'`
+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'`
 echo "Domain controller IP address: $dcip"
 [ -n "$dcip" ] || exit 1