From 80120a79bc5381d86241b4173f085a00f5bb7e01 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Jan 2003 12:54:59 +0000
Subject: Patch from ab, to make findsmb omit -r most of the time.

(original mail follows)
--
From:	Alexander Bokovoy <a.bokovoy@sam-solutions.net>
Greetings!

I propose to make an optional argument '-r' for findsmb utility to pass
'-r' option to nmblookup optionally and default to omit it. The reason is
to have findsmb working more user-friendly in contemporary office
environments where Windows 95/98 boxes are rare and also to allow usage of
the utility under non-priviledged accounts when Windows95/98 boxes are in
minority or even absent in network neighbourhood.

An attached patch provides this change for HEAD together with
documentation changes.

--
/ Alexander Bokovoy
(This used to be commit d0bebea521e12fb9cef66feecd969216607ef63d)
---
 docs/docbook/manpages/findsmb.1.sgml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'docs/docbook/manpages/findsmb.1.sgml')

diff --git a/docs/docbook/manpages/findsmb.1.sgml b/docs/docbook/manpages/findsmb.1.sgml
index fb953b9f25..a246b162b1 100644
--- a/docs/docbook/manpages/findsmb.1.sgml
+++ b/docs/docbook/manpages/findsmb.1.sgml
@@ -39,6 +39,15 @@
 	<title>OPTIONS</title>
 
 	<variablelist>
+		<varlistentry>
+		<term>-r</term>
+		<listitem><para>Controls whether <command>findsmb</command> takes
+		bugs in Windows95 into account when trying to find a Netbios name
+		registered of the remote machine. This option is disabled by default
+		because it is specific to Windows 95 and Windows 95 machines only. 
+		If set, <ulink url="nmblookup.1.html"><command>nmblookup</command></ulink>
+		will be called with <constant>-B<constant> option.</para></listitem>
+		</varlistentry>
 		<varlistentry>
 		<term>subnet broadcast address</term>
 		<listitem><para>Without this option, <command>findsmb
@@ -66,15 +75,17 @@
 	not show any information about the operating system or server 
 	version.</para>
 
-	<para>The command must be run on a system without <ulink
+	<para>The command with <constant>-r</constant> option
+	must be run on a system without <ulink
 	url="nmbd.8.html"><command>nmbd</command></ulink> running. 
 	If <command>nmbd</command> is running on the system, you will 
 	only  get the IP address and the DNS name of the machine. To 
 	get proper responses  from Windows 95 and Windows 98 machines, 
-	the command must be run as root. </para>
+	the command must be run as root and with <constant>-r</constant>
+	option on a machine without <command>nmbd</command> running.</para>
 
-	<para>For example, running <command>findsmb</command> on a machine 
-	without <command>nmbd</command> running would yield output similar
+	<para>For example, running <command>findsmb</command> without 
+	<constant>-r</constant> option set would yield output similar
 	to the following</para>
 
 	<screen><computeroutput>
-- 
cgit