first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

(This used to be commit 453a822a76)

README

@@ -1,10 +1,13 @@
-This is version 2.1.0alphaX of Samba, the free SMB and CIFS client and
+This is version 2.0.X of Samba, the free SMB and CIFS client and
 server for unix and other operating systems. Samba is maintained by
 the Samba Team, who support the original author, Andrew Tridgell.
 
 >>>> Please read THE WHOLE of this file as it gives important information
 >>>> about the configuration and use of Samba.
 
+NOTE: Installation instructions may be found in 
+      docs/textdocs/UNIX_INSTALL.txt
+
 This software is freely distributable under the GNU public license, a
 copy of which you should have received with this software (in a file
 called COPYING). 
@@ -136,14 +139,7 @@ available on the web page.
 
 If you would like to help with the documentation (and we _need_ help!)
 then have a look at the mailing list samba-docs, archived at
-http://samba.org/listproc/samba-docs.
+http://lists.samba.org/
-
-
-FTP SITE
---------
-
-Please use a mirror site! The list of mirrors is in docs/MIRRORS.txt.
-The master ftp site is samba.org in the directory pub/samba.
 
 
 MAILING LIST
@@ -161,7 +157,7 @@ body of "subscribe samba-announce Your Name". All announcements also
 go to the samba list.
 
 For details of other Samba mailing lists and for access to archives, see
-http://samba.org/listproc.
+http://lists.samba.org/
 
 
 NEWS GROUP
@@ -186,6 +182,3 @@ As well as general information and documentation, this also has searchable
 archives of the mailing list and a user survey that shows who else is using
 this package. Have you registered with the survey yet? :-)
 
-It is maintained by Paul Blackman (thanks Paul!). You can contact him
-as ictinus@samba.org.
-

Roadmap

@@ -1,9 +1,9 @@
-Copyright (C) 1997-1998 - Samba-Team
+Copyright (C) 1997-1999 - Samba-Team
 
 The Samba-Team are committed to an aggressive program to deliver quality
 controlled software to a well defined roadmap.
 
-The current Samba release 2.0.0 is called the "Domain Client Release"
+The current Samba release 2.0.4 is called the "NT Security update".
 
 It correctly implements the Windows NT specific SMB calls,
 and will operate correctly as a client in a Windows NT
@@ -24,6 +24,9 @@ are in place:
 2.0.x       -   "NT Security update" - Allowing Windows NT Clients to
                 manipulate file security and ownership using native tools.
 
+Note that the "NT Security update" part of the Roadmap has been
+achieved with the Samba 2.0.4 release.
+
 2.0.xx      -   "Thin Server" mode, allowing a Samba server to be
                 inserted into a network with no UNIX setup required.
                 Some management capabilities for Samba using native NT tools.

WHATSNEW.txt

@@ -1,5 +1,263 @@
-          WHATS NEW IN Samba 2.0.0 beta1
+              WHATS NEW IN Samba 2.0.4b
-          ==============================
+              =========================
+
+This is the latest stable release of Samba. This is the
+version that all production Samba servers should be running
+for all current bug-fixes.
+
+New/Changed parameters in 2.0.4
+-------------------------------
+
+There are 5 new parameters and one modified parameter in
+the smb.conf file.
+
+allow trusted domains
+restrict anonymous
+mangle locks
+oplock break wait time
+oplock contention limit
+
+The new parameters are :
+
+allow trusted domains
+---------------------
+
+This option is used in "security=domain" settings and allows
+the Samba admin to restrict access to users within the domain
+the the Samba server is in.
+
+restrict anonymous
+------------------
+
+This parameter allows the Samba admin to cause Samba to
+refuse access to anonymous users. Use of this parameter
+is only recommened for homogenous NT client environments.
+
+mangle locks
+------------
+
+This parameter was added to get around a bug in Windows NT
+when dealing with Samba running on 32-bit systems (such
+as Linux x86). This bug causes NT to send 64 bit locking
+requests to 32-bit systems even though Samba correctly 
+tells the NT client not to do so. This option causes Samba
+to map the lock requests from 64 bits to 32 bits on these
+systems.
+
+oplock break wait time
+----------------------
+
+This tuning parameter, added to help with clients that don't
+respond to oplock break requests, causes Samba to deley for
+this number of milliseconds before sending an oplock break
+request to a client that caused the break to be sent. The
+default is 10ms. This is an advanced tuning parameter and
+should not be changed lightly.
+
+oplock contention limit
+-----------------------
+
+This tuning parameter causes Samba not to grant oplocks
+when an smbd daemon notices that there have been this 
+many concurrent requests for an oplock on a file. This
+prevents the "baton passing" oplock problem where many
+clients accessing one file pass the oplock between themselves
+like a baton. The default is 2. This is an advanced tuning
+parameter and should not be changed lightly.
+
+The modified parameter is :
+
+nt acl support
+--------------
+
+This is a global parameter that defaulted to False in
+the previous release (2.0.3) and now defaults to True
+as the RPC code has been added to Samba to allow it to
+map UNIX permissions to NT ACLs.
+
+All of these new parameters and changes are documented in the
+smb.conf man pages and html pages.
+
+Updated and New documentation
+-----------------------------
+
+A new document describing the manipulation of UNIX permissions
+via the Windows NT security dialogs and their interaction with
+Samba 2.0.4 is provided as :
+
+docs/textdocs/NT_Security.txt
+docs/htmldocs/NT_Security.html
+
+Changes in 2.0.4b
+-----------------
+
+A bug with MS-Word 97 saving files with zero UNIX permissions
+was fixed. Even though a workaround is available (set force
+create mode = 644 on the share) Word is such an important
+application that a point fix was neccessary.
+
+Changes in 2.0.4a
+-----------------
+
+The text and html versions of NT_Security were missing from
+the shipping tarball. Also a compile bug for platforms that
+don't have usleep was fixed.
+
+Bugfixes added since 2.0.3
+--------------------------
+
+1). Fix for 8 character password problem when using HPUX and
+plaintext passwords.
+2). --with-pam option added to ./configure.
+3). Client fixes for memory leak and display of 64 bit values.
+4). Fixes for -E and -s option with smbclient.
+5). smbclient now allows -L //server or -L \\server
+6). smbtar fix for display of 64 bit values.
+7). Endian independence added to DCE/RPC code.
+8). DCE/RPC marshalling/unmarshalling code re-written to provide
+overflow reporting and sign and seal support.
+9). Bind NAK reply packet added to DCE/RPC code, used to correctly
+refuse bind requests (prevents NT system event log messages).
+10). Mapping of UNIX permissions into NT ACL's for get and set
+added.
+11). DCE/RPC enumeration of numbers of shares made dynamic. 
+Samba now has no limit on the number of exported shares seen.
+12). Fix to speed up random number seed generation on /dev/urandom
+being unavailable.
+13). Several memory fixes added by running Purify on the code.
+14). Read from client error messages improved.
+15). Fixed endianness used in UNICODE strings.
+16). Cope with ERRORmoredata in an RPC pipe client call.
+17). Check for malformed responses in nmbd register name.
+18). NT Encrypted password changing from the NT password dialog box
+now fully implmented.
+19). Mangle 64-bit lock ranges into 32-bits (NT bug!) on a 32-bit
+Samba platform.
+20). Allow file to be pseudo-openend in order to read security only.
+21). Improve filename mangling to reduce chance of collisions.
+22). Added code to prevent granting of oplocks when a file is under
+contention.
+23). Added tunable wait time before sending an oplock break request
+to a client if the client caused the break request. Helps with clients
+not responding to oplock breaks.
+24). Always respond negatively to queued local oplock break messages
+before shutdown. This can prevent "freezes" on an oplock error.
+25). Allow admin to restrict logons to correct domain when in domain
+level security.
+26). Added "restrict anonymous" patch from Andy (thwartedefforts@wonky.org)
+to prevent parameter substitution problems with anonymous connections.
+27). Fix SMBseek where seeking to a negative number sets the offset
+to zero.
+28). Fixed problem with mode getting corrupted in trans2 request
+(setting to zero means please ignore it).
+29). Correctly become the authenticated user on an authenticated
+DCE/RPC pipe request.
+30). Correctly reset debug level in nmbd if someone set it on the
+command line.
+31). Added more checking into testparm
+32). NetBench simulator added to smbtorture by Andrew.
+33). Fixed NIS+ option compile (was broken in 2.0.3).
+34). Recursive smbclient directory listing fix. Patch from E. Jay Berkenbilt
+(ejb@ql.org)
+
+Bugfixes added since 2.0.2
+--------------------------
+
+1). --with-ssl configure now include ssl include directory. Fix
+from Richard Sharpe.
+2). Patch for configure for glibc2.1 support (large files etc.).
+3). Several bugfixes for smbclient tar mode from Bob Boehmer
+(boehmer@worldnet.att.net) to fix smbclient aborting problems
+when restoring tar files.
+4). Some automount fixes for smbmount.
+5). Attempt to fix the AIX 4.1.x/3.x problems where smbd runs as
+root. As no-one has given us root access to such a server this
+cannot be tested fully, but should work.
+6). Crash bug fix in debug code where *real* uid rather than 
+*effective* uid was being checked before attempting to rotate
+log files. This fix should help a *lot* of people who were
+reporting smbd aborting in the middle of a copy operation.
+7). SIGALRM bugfix to ensure infinate file locks time out.
+8). New code to implement NT ACL reporting for cacls.exe program.
+9). UDP loopback socket rebind fix for Solaris.
+10). Ensure all UNICODE strings are correctly in little-endian
+format.
+11). smbpasswd file locking fix.
+12). Fixes for strncpy problems with glibc2.1.
+13). Ensure smbd correctly reports major and minor version number
+and server type when queried via NT rpc calls.
+14). Bugfix for short mangled names not being pulled off the
+mangled stack correctly.
+15). Fix for mapping of rwx bits being incorrectly overwritten
+when doing ATTRIB.EXE
+16). Fix for returning multiple PDU packets in NT rpc code. Should
+allow multiple shares to be returned correctly).
+17). Improved mapping of NT open access requests into UNIX open
+modes.
+18). Fix for copying files from an NTFS volume that contain
+multiple data forks. Added 'magic' error code NT needs.
+19). Fixed crash bug when primary NT authentication server
+is down, rolls over to secondaries correctly now.
+20). Fixed timeout processing to be timer based. Now will
+always occur even if smbd is under load.
+21). Fixed signed/unsigned problem in quotas code.
+22). Fixed bug where setting the password of a completely fresh
+user would end up setting the account disabled flag.
+23). Improved user logon messages to help admins having
+trouble with user authentication.
+
+Bugfixes added since 2.0.1
+--------------------------
+
+Note that due to a critical signal handling bug in 2.0.1,
+this release has been removed and replaced immediately with 
+2.0.2. The Samba Team would like to apologise for any problem
+this may have caused.
+
+1). Fixed smbd looping on SIGCLD problem. This was
+    caused by a missing break statement in a critical
+    piece of code.
+
+Bugfixes added since 2.0.0
+--------------------------
+
+1). Autoconf changes for gcc2.7.x and Solaris 2.5/2.6
+2). Autoconf changes to help HPUX configure correctly.
+3). Autoconf changes to allow lock directory to be set.
+4). Client fix to allow port to be set.
+5). clitar fix to send debug messages to stderr.
+6). smbmount race condition fix.
+7). Fix for bug where trying to browse large numbers of shares
+    generated an error from an NT client.
+8). Wrapper for setgroups for SunOS 4.x
+9). Fix for directory deleting failing from multiuser NT.
+10). Fix for crash bug if bitmap was full.
+11). Fix for Linux genrand where /dev/random could cause 
+     clients to timeout on connect if the entropy pool was
+     empty.
+12). The default PASSWD_CHAT may now be overridden in local.h
+13). HPUX printing fixes for default programs.
+14). Reverted (erroneous) code in MACHINE.SID generation that
+     was setting the sid to 0x21 - should be *decimal* 21.
+15). Fix for printing to remote machine under SVR4.
+16). Fix for chgpasswd wait being interrupted with EINTR.
+17). Fix for disk free routine. NT and Win98 now correctly
+     show greater than 2GB disks.
+18). Fix for crash bug in stat cache statistics printing.
+19). Fix for filenames ending in .~xx.
+20). Fix for access check code wait being interrupted with EINTR.
+21). Fix for password changes from "invalid password" to a valid
+     one setting the account disabled bit.
+22). Fix for smbd crash bug in SMBreadraw cache prime code.
+23). Fix for overly zealous lock range overflow reporting.
+24). Fix for large disk disk free reporting (NT SMB code).
+25). Fix for NT failing to truncate files correctly.
+26). Fix for smbd crash bug with SMBcancel calls.
+27). Additional -T flag to nmblookup to do reverse DNS on addresses.
+28). SWAT fix to start/stop smbd/nmbd correctly.
+
+Major changes in Samba 2.0
+--------------------------
 
 This is a MAJOR new release of Samba, the UNIX based SMB/CIFS file 
 and print server for Windows systems.
@@ -12,9 +270,6 @@ for configuring Samba has been added.
 In addition, Samba has been re-written to help portability to
 other POSIX-based systems, based on the GNU autoconf tool.
 
-Major changes in Samba 2.0
---------------------------
-
 There are many major changes in Samba for version 2.0.  Here are 
 some of them:
 
@@ -107,6 +362,10 @@ In addition, Samba now defaults to case sensitivity options that
 match a Windows NT server precisely, that is, case insensitive 
 but case preserving.
 
+The default format of the smbpasswd file has also been
+changed for this release, although the new tools will read
+and write the old format, for backwards compatibility.
+
 =====================================================================
 
 NOTE - Primary Domain Controller Functionality
@@ -120,9 +379,11 @@ Domain Controller than serving Windows NT logon requests.
 A useful version of a Primary Domain Controller contains
 many remote procedure calls to do things like enumerate users, 
 groups, and security information, only some of which Samba currently
-implements.  For this reason we have chosen not to advertise
+implements. In addition, there are outstanding (known) bugs with
-and actively support Primary Domain Controller functionality
+using Samba as a PDC in this release that the Samba Team are actively
-with this release.
+working on. For this reason we have chosen not to advertise and 
+actively support Primary Domain Controller functionality with this
+release.
 
 This work is being done in the CVS (developer) versions of Samba,
 development of which continues at a fast pace.  If you are

docs/announce

@@ -1,4 +1,4 @@
-		Announcing Samba version 1.9
+		Announcing Samba version 2.0
 		============================
 
 What is Samba?
@@ -47,10 +47,12 @@ umask support, guest connections, name mangling and hidden and system
 attribute mapping. Look at the FAQs included with the package for
 a full list of features.
 
-What's new since 1.8?
+What's new since 1.9?
 ---------------------
 
 Lots of stuff. See the change log and man pages for details.
+In particular, please check the WHATSNEW.txt file in the root directory
+of each release. This file has current change/update information.
 
 Where can I get a client for my PC?
 -----------------------------------
@@ -136,7 +138,7 @@ There is also often quite a bit of discussion about Samba on the
 newsgroup comp.protocols.smb.
 
 A WWW site with lots of Samba info can be found at 
-http://samba.org/
+http://samba.org/samba/
 
 The Samba Team (Contact: samba-bugs@samba.org)
 June 1996

docs/faq/sambafaq-2.html

@@ -18,14 +18,11 @@
 <P>
 <A NAME="no_browse"></A> 
 
-See 
+See BROWSING.txt for more information on browsing.  BROWSING.txt can
-<A HREF="ftp://samba.org/pub/samba/BROWSING.txt">BROWSING.txt</A>
+be found in the docs directory of the Samba source.</P> <P>If your GUI
-for more information on browsing.  Browsing.txt can also be found
+client does not permit you to select non-browsable servers, you may
-in the docs directory of the Samba source.</P>
+need to do so on the command line. For example, under Lan Manager you
-<P>If your GUI client does not permit you to select non-browsable
+might connect to the above service as disk drive M: thusly:
-servers, you may need to do so on the command line. For example, under
-Lan Manager you might connect to the above service as disk drive M:
-thusly:
 <BLOCKQUOTE><CODE>
 <PRE>
    net use M: \\mary\fred

docs/htmldocs/DOMAIN_MEMBER.html

@@ -13,7 +13,7 @@
 
 <h1>Joining an NT Domain with Samba 2.0</h1>
 <h2>Jeremy Allison, Samba Team</h2>
-<h2>11th November 1998</h2>
+<h2>7th October 1999</h2>
 
     
  
@@ -23,7 +23,8 @@
 <p><br>In order for a Samba-2 server to join an NT domain, you must first add
 the NetBIOS name of the Samba server to the NT domain on the PDC using
 Server Manager for Domains.  This creates the machine account in the
-domain (PDC) SAM.
+domain (PDC) SAM. Note that you should add the Samba server as a "Windows
+NT Workstation or Server", <em>NOT</em> as a Primary or backup domain controller.
 <p><br>Assume you have a Samba-2 server with a NetBIOS name of <code>SERV1</code> and are
 joining an NT domain called <code>DOM</code>, which has a PDC with a NetBIOS name
 of <code>DOMPDC</code> and two backup domain controllers with NetBIOS names <code>DOMBDC1</code>
@@ -63,6 +64,9 @@ use domain security.
 <p><br>line in the <a href="smb.conf.5.html#global"><strong>[global]</strong></a> section to read: 
 <p><br><code>workgroup = DOM</code>
 <p><br>as this is the name of the domain we are joining. 
+<p><br>You must also have the parameter <a href="smb.conf.5.html#encryptpasswords"><strong>"encrypt passwords"</strong></a>
+set to <code>"yes"</code> in order for your users to authenticate to the
+NT PDC.
 <p><br>Finally, add (or modify) a:
 <p><br><a href="smb.conf.5.html#passwordserver"><strong>"password server ="</strong></a>
 <p><br>line in the <a href="smb.conf.5.html#global"><strong>[global]</strong></a> section to read: 
@@ -72,18 +76,13 @@ to contact in order to authenticate users. Samba will try to contact
 each of these servers in order, so you may want to rearrange this list
 in order to spread out the authentication load among domain
 controllers.
-<p><br>Currently, Samba requires that a defined list of domain controllers be
+<p><br>Alternatively, if you want smbd to automatically determine the
-listed in this parameter in order to authenticate with domain-level
+list of Domain controllers to use for authentication, you may set this line to be :
-security. NT does not use this method, and will either broadcast or
+<p><br><code>password server = *</code>
-use a WINS database in order to find domain controllers to
+<p><br>This method, which is new in Samba 2.0.6 and above, allows Samba
+to use exactly the same mechanism that NT does. This method either broadcasts or
+uses a WINS database in order to find domain controllers to
 authenticate against.
-<p><br>Originally, I considered this idea for Samba, but dropped it because
-it seemed so insecure.  However several Samba-2 alpha users have
-requested that this feature be added to make Samba more NT-like, so
-I'll probably add a special name of <code>'*'</code> (which means: act like NT
-when looking for domain controllers) in a future release of the
-code. At present, however, you need to know where your domain
-controllers are.
 <p><br>Finally, restart your Samba daemons and get ready for clients to begin
 using domain security!
 <p><br><center>Why is this better than security = server? </center>

docs/htmldocs/nmbd.8.html

@@ -25,7 +25,7 @@ naming services to clients
 <p><br><a name="SYNOPSIS"></a>
 <h2>SYNOPSIS</h2>
     
-<p><br><strong>nmbd</strong> [<a href="nmbd.8.html#minusD">-D</a>] [<a href="nmbd.8.html#minuso">-o</a>] [<a href="nmbd.8.html#minusa">-a</a>] [<a href="nmbd.8.html#minusH">-H lmhosts file</a>] [<a href="nmbd.8.html#minusd">-d debuglevel</a>] [<a href="nmbd.8.html#minusl">-l log file basename</a>] [<a href="nmbd.8.html#minusn">-n primary NetBIOS name</a>] [<a href="nmbd.8.html#minusp">-p port number</a>] [<a href="nmbd.8.html#minuss">-s configuration file</a>] [<a href="nmbd.8.html#minusi">-i NetBIOS scope</a>] [<a href="nmbd.8.html#minush">-h</a>]
+<p><br><strong>nmbd</strong> [<a href="nmbd.8.html#minusD">-D</a>] [<a href="nmbd.8.html#minusa">-a</a>] [<a href="nmbd.8.html#minuso">-o</a>] [<a href="nmbd.8.html#minush">-h</a>] [<a href="nmbd.8.html#minusV">-V</a>] [<a href="nmbd.8.html#minusH">-H lmhosts file</a>] [<a href="nmbd.8.html#minusd">-d debuglevel</a>] [<a href="nmbd.8.html#minusl">-l log file basename</a>] [<a href="nmbd.8.html#minusn">-n primary NetBIOS name</a>] [<a href="nmbd.8.html#minusp">-p port number</a>] [<a href="nmbd.8.html#minuss">-s configuration file</a>] [<a href="nmbd.8.html#minusi">-i NetBIOS scope</a>]
 <p><br><a name="DESCRIPTION"></a>
 <h2>DESCRIPTION</h2>
     
@@ -70,6 +70,10 @@ append log messages to the log file.  This is the default.
 <li><strong><strong>-o</strong></strong> If this parameter is specified, the log files will be
 overwritten when opened.  By default, the log files will be appended
 to.
+<p><br><a name="minush"></a>
+<li><strong><strong>-h</strong></strong> Prints the help information (usage) for <strong>nmbd</strong>.
+<p><br><a name="minusV"></a>
+<li><strong><strong>-V</strong></strong> Prints the version number for <strong>nmbd</strong>.
 <p><br><a name="minusH"></a>
 <li><strong><strong>-H filename</strong></strong> NetBIOS lmhosts file.
 <p><br>The lmhosts file is a list of NetBIOS names to IP addresses that is
@@ -133,8 +137,6 @@ use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes
 are <em>very</em> rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with.
-<p><br><a name="minush"></a>
-<li><strong><strong>-h</strong></strong> Prints the help information (usage) for <strong>nmbd</strong>.
 <p><br></ul>
 <p><br><a name="FILES"></a>
 <h2>FILES</h2>

docs/htmldocs/nmblookup.1.html

@@ -24,7 +24,7 @@
 <p><br><a name="SYNOPSIS"></a>
 <h2>SYNOPSIS</h2>
      
-<p><br><strong>nmblookup</strong> [<a href="nmblookup.1.html#minusM">-M</a>] [<a href="nmblookup.1.html#minusR">-R</a>] [<a href="nmblookup.1.html#minusS">-S</a>] [<a href="nmblookup.1.html#minusr">-r</a>] [<a href="nmblookup.1.html#minusA">-A</a>] [<a href="nmblookup.1.html#minush">-h</a>] [<a href="nmblookup.1.html#minusB">-B broadcast address</a>] [<a href="nmblookup.1.html#minusU">-U unicast address</a>] [<a href="nmblookup.1.html#minusd">-d debuglevel</a>] [<a href="nmblookup.1.html#minuss">-s smb config file</a>] [<a href="nmblookup.1.html#minusi">-i NetBIOS scope</a>] <a href="nmblookup.1.html#name">name</a>
+<p><br><strong>nmblookup</strong> [<a href="nmblookup.1.html#minusM">-M</a>] [<a href="nmblookup.1.html#minusR">-R</a>] [<a href="nmblookup.1.html#minusS">-S</a>] [<a href="nmblookup.1.html#minusr">-r</a>] [<a href="nmblookup.1.html#minusA">-A</a>] [<a href="nmblookup.1.html#minush">-h</a>] [<a href="nmblookup.1.html#minusB">-B broadcast address</a>] [<a href="nmblookup.1.html#minusU">-U unicast address</a>] [<a href="nmblookup.1.html#minusd">-d debuglevel</a>] [<a href="nmblookup.1.html#minuss">-s smb config file</a>] [<a href="nmblookup.1.html#minusi">-i NetBIOS scope</a>] [<a href="nmblookup.1.html#minusT">-T</a>] <a href="nmblookup.1.html#name">name</a>
 <p><br><a name="DESCRIPTION"></a>
 <h2>DESCRIPTION</h2>
     
@@ -38,8 +38,9 @@ or to a particular machine. All queries are done over UDP.
     
 <p><br><ul>
 <p><br><a name="minusM"></a>
-<li><strong><strong>-M</strong></strong> Searches for a master browser. This is done by doing a
+<li><strong><strong>-M</strong></strong> Searches for a master browser by looking up the 
-broadcast lookup on the special name <code>__MSBROWSE__</code>.
+NetBIOS name <a href="nmblookup.1.html#name"><strong>name</strong></a> with a type of 0x1d. If <a href="nmblookup.1.html#name"><strong>name</strong></a>
+is <code>"-"</code> then it does a lookup on the special name <code>__MSBROWSE__</code>.
 <p><br><a name="minusR"></a>
 <li><strong><strong>-R</strong></strong> Set the recursion desired bit in the packet to do a
 recursive lookup. This is used when sending a name query to a machine
@@ -67,8 +68,8 @@ query on this address.
 <p><br><a name="minusB"></a>
 <li><strong><strong>-B broadcast address</strong></strong> Send the query to the given broadcast
 address. Without this option the default behavior of nmblookup is to
-send the query to the broadcast address of the primary network
+send the query to the broadcast address of the network
-interface as either auto-detected or defined in the 
+interfaces as either auto-detected or defined in the 
 <a href="smb.conf.5.html#interfaces"><strong>interfaces</strong></a> parameter of the 
 <a href="smb.conf.5.html"><strong>smb.conf (5)</strong></a> file.
 <p><br><a name="minusU"></a>
@@ -100,6 +101,11 @@ use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes
 are <em>very</em> rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with.
+<p><br><a name="minusT"></a>
+<li><strong><strong>-T</strong></strong> This causes any IP addresses found in the lookup to be
+looked up via a reverse DNS lookup into a DNS name, and printed out
+before each <code>"IP address   NetBIOS name"</code> pair that is the normal
+output.
 <p><br><a name="name"></a>
 <li><strong><strong>name</strong></strong> This is the NetBIOS name being queried. Depending upon
 the previous options this may be a NetBIOS name or IP address. If a

docs/htmldocs/samba.7.html

@@ -56,14 +56,6 @@ client. This is useful for accessing SMB shares on other compatible
 servers (such as Windows NT), and can also be used to allow a UNIX box
 to print to a printer attached to any SMB server (such as a PC running
 Windows NT).
-<p><br><li><strong><a href="rpcclient.1.html"><strong>rpcclient</strong></a></strong> <br> <br> The <a href="rpcclient.1.html"><strong>rpcclient</strong>
-(1)</a> program is a client that can 'talk' to an
-SMB/CIFS MSRPC server.  Operations include things like managing a SAM
-Database (users, groups and aliases) in the same way as the Windows NT
-programs <strong>User Manager for Domains</strong> and <strong>Server Manager for Domains</strong>;
-managing a remote registry in the same way as the Windows NT programs
-<strong>REGEDT32.EXE</strong> and <strong>REGEDIT.EXE</strong>; viewing a remote event log (same
-as <strong>EVENTVWR.EXE</strong>).
 <p><br><li><strong><a href="testparm.1.html"><strong>testparm</strong></a></strong> <br> <br> The <a href="testparm.1.html"><strong>testparm
 (1)</strong></a> utility allows you to test your <a href="smb.conf.5.html"><strong>smb.conf
 (5)</strong></a> configuration file.

docs/htmldocs/smbclient.1.html

@@ -24,7 +24,7 @@
 <p><br><a name="SYNOPSIS"></a>
 <h2>SYNOPSIS</h2>
     
-<p><br><strong>smbclient</strong> <a href="smbclient.1.html#servicename">servicename</a> [<a href="smbclient.1.html#password">password</a>] [<a href="smbclient.1.html#minuss">-s smb.conf</a>] [<a href="smbclient.1.html#minusB">-B IP addr</a>] [<a href="smbclient.1.html#minusO">-O socket options</a>][<a href="smbclient.1.html#minusR">-R name resolve order</a>] [<a href="smbclient.1.html#minusM">-M NetBIOS name</a>] [<a href="smbclient.1.html#minusi">-i scope</a>] [<a href="smbclient.1.html#minusN">-N</a>] [<a href="smbclient.1.html#minusn">-n NetBIOS name</a>] [<a href="smbclient.1.html#minusd">-d debuglevel</a>] [<a href="smbclient.1.html#minusP">-P</a>] [<a href="smbclient.1.html#minusp">-p port</a>] [<a href="smbclient.1.html#minusl">-l log basename</a>] [<a href="smbclient.1.html#minush">-h</a>] [<a href="smbclient.1.html#minusI">-I dest IP</a>] [<a href="smbclient.1.html#minusE">-E</a>] [<a href="smbclient.1.html#minusU">-U username</a>] [<a href="smbclient.1.html#minusL">-L NetBIOS name</a>] [<a href="smbclient.1.html#minust">-t terminal code</a>] [<a href="smbclient.1.html#minusm">-m max protocol</a>] [<a href="smbclient.1.html#minusW">-W workgroup</a>] [<a href="smbclient.1.html#minusT">-T&lt;c|x&gt;IXFqgbNan</a>] [<a href="smbclient.1.html#minusD">-D directory</a>] [<a href="smbclient.1.html#minusc">-c command string</a>]
+<p><br><strong>smbclient</strong> <a href="smbclient.1.html#servicename">servicename</a> [<a href="smbclient.1.html#minuss">-s smb.conf</a>] [<a href="smbclient.1.html#minusO">-O socket options</a>][<a href="smbclient.1.html#minusR">-R name resolve order</a>] [<a href="smbclient.1.html#minusM">-M NetBIOS name</a>] [<a href="smbclient.1.html#minusi">-i scope</a>] [<a href="smbclient.1.html#minusN">-N</a>] [<a href="smbclient.1.html#minusn">-n NetBIOS name</a>] [<a href="smbclient.1.html#minusd">-d debuglevel</a>] [<a href="smbclient.1.html#minusP">-P</a>] [<a href="smbclient.1.html#minusp">-p port</a>] [<a href="smbclient.1.html#minusl">-l log basename</a>] [<a href="smbclient.1.html#minush">-h</a>] [<a href="smbclient.1.html#minusI">-I dest IP</a>] [<a href="smbclient.1.html#minusE">-E</a>] [<a href="smbclient.1.html#minusU">-U username</a>] [<a href="smbclient.1.html#minusL">-L NetBIOS name</a>] [<a href="smbclient.1.html#minust">-t terminal code</a>] [<a href="smbclient.1.html#minusm">-m max protocol</a>] [<a href="smbclient.1.html#minusb">-b buffersize</a>] [<a href="smbclient.1.html#minusW">-W workgroup</a>] [<a href="smbclient.1.html#minusT">-T&lt;c|x&gt;IXFqgbNan</a>] [<a href="smbclient.1.html#minusD">-D directory</a>] [<a href="smbclient.1.html#minusc">-c command string</a>]
 <p><br><a name="DESCRIPTION"></a>
 <h2>DESCRIPTION</h2>
     
@@ -74,8 +74,6 @@ rejected by these servers.
 Samba configuration file, smb.conf. This file controls all aspects of
 the Samba setup on the machine and smbclient also needs to read this
 file.
-<p><br><a name="minusB"></a>
-<li><strong><strong>-B IP addr</strong></strong> The IP address to use when sending a broadcast packet.
 <p><br><a name="minusO"></a>
 <li><strong><strong>-O socket options</strong></strong> TCP socket options to set on the client
 socket. See the <a href="smb.conf.5.html#socketoptions">socket options</a>
@@ -102,8 +100,7 @@ no WINS server has been specified this method will be ignored.
 listed in the <a href="smb.conf.5.html#interfaces"><strong>interfaces</strong></a> parameter
 in the smb.conf file. This is the least reliable of the name resolution
 methods as it depends on the target host being on a locally connected
-subnet. To specify a particular broadcast address the <a href="smbclient.1.html#minusB"><strong>-B</strong></a> option 
+subnet. 
-may be used.
 <p><br></ul>
 <p><br>If this parameter is not set then the name resolve order defined
 in the <a href="smb.conf.5.html"><strong>smb.conf</strong></a> file parameter 
@@ -238,7 +235,7 @@ then the password as part of username will take precedence. Putting
 nothing before or nothing after the percent symbol will cause an empty
 username or an empty password to be used, respectively.
 <p><br>The password may also be specified by setting up an environment
-variable called <code>PASSWORD</code> that contains the users password. Note
+variable called <code>PASSWD</code> that contains the users password. Note
 that this may be very insecure on some systems but on others allows
 users to script smbclient commands without having a password appear in
 the command line of a process listing.
@@ -246,7 +243,7 @@ the command line of a process listing.
 on an uppercase password. Lowercase or mixed case passwords may be
 rejected by these servers.
 <p><br>Be cautious about including passwords in scripts or in the
-<code>PASSWORD</code> environment variable. Also, on many systems the command
+<code>PASSWD</code> environment variable. Also, on many systems the command
 line of a running process may be seen via the <code>ps</code> command to be
 safe always allow smbclient to prompt for a password and type it in
 directly.
@@ -273,6 +270,11 @@ Samba source code for the complete list.
 protocols level the server supports. This parameter is
 preserved for backwards compatibility, but any string
 following the <strong>-m</strong> will be ignored.
+<p><br><a name="minusb"></a>
+<li><strong><strong>-b buffersize</strong></strong> This option changes the transmit/send buffer
+size when getting or putting a file from/to the server. The default
+is 65520 bytes. Setting this value smaller (to 1200 bytes) has been
+observed to speed up file transfers to and from a Win9x server.
 <p><br><a name="minusW"></a>
 <li><strong><strong>-W WORKGROUP</strong></strong> Override the default workgroup specified in the
 <a href="smb.conf.5.html#workgroup"><strong>workgroup</strong></a> parameter of the
@@ -535,7 +537,7 @@ LANMAN2 protocol or above.
 <p><br>The variable <strong>USER</strong> may contain the username of the person using the
 client.  This information is used only if the protocol level is high
 enough to support session-level passwords.
-<p><br>The variable <strong>PASSWORD</strong> may contain the password of the person using
+<p><br>The variable <strong>PASSWD</strong> may contain the password of the person using
 the client.  This information is used only if the protocol level is
 high enough to support session-level passwords.
 <p><br><a name="INSTALLATION"></a>

docs/htmldocs/smbd.8.html

@@ -24,7 +24,7 @@
 <p><br><a name="SYNOPSIS"></a>
 <h2>SYNOPSIS</h2>
     
-<p><br><strong>smbd</strong> [<a href="smbd.8.html#minusD">-D</a>] [<a href="smbd.8.html#minusa">-a</a>] [<a href="smbd.8.html#minuso">-o</a>] [<a href="smbd.8.html#minusd">-d debuglevel</a>] [<a href="smbd.8.html#minusl">-l log file</a>] [<a href="smbd.8.html#minusp">-p port number</a>] [<a href="smbd.8.html#minusO">-O socket options</a>] [<a href="smbd.8.html#minuss">-s configuration file</a>] [<a href="smbd.8.html#minusi">-i scope</a>] [<a href="smbd.8.html#minusP">-P</a>] [<a href="smbd.8.html#minush">-h</a>]
+<p><br><strong>smbd</strong> [<a href="smbd.8.html#minusD">-D</a>] [<a href="smbd.8.html#minusa">-a</a>] [<a href="smbd.8.html#minuso">-o</a>] [<a href="smbd.8.html#minusP">-P</a>] [<a href="smbd.8.html#minush">-h</a>] [<a href="smbd.8.html#minusV">-V</a>] [<a href="smbd.8.html#minusd">-d debuglevel</a>] [<a href="smbd.8.html#minusl">-l log file</a>] [<a href="smbd.8.html#minusp">-p port number</a>] [<a href="smbd.8.html#minusO">-O socket options</a>] [<a href="smbd.8.html#minuss">-s configuration file</a>] [<a href="smbd.8.html#minusi">-i scope</a>]
 <p><br><a name="DESCRIPTION"></a>
 <h2>DESCRIPTION</h2>
     
@@ -75,6 +75,13 @@ append log messages to the log file.  This is the default.
 <li><strong><strong>-o</strong></strong> If this parameter is specified, the log files will be
 overwritten when opened.  By default, the log files will be appended
 to.
+<p><br><a name="minusP"></a>
+<li><strong><strong>-P</strong></strong> Passive option. Causes smbd not to send any network traffic
+out. Used for debugging by the developers only.
+<p><br><a name="minush"></a>
+<li><strong><strong>-h</strong></strong> Prints the help information (usage) for <strong>smbd</strong>.
+<p><br><a name="minusV"></a>
+<li><strong><strong>-V</strong></strong> Prints the version number for <strong>smbd</strong>.
 <p><br><a name="minusd"></a>
 <li><strong><strong>-d debuglevel</strong></strong> debuglevel is an integer from 0 to 10.
 <p><br>The default value if this parameter is not specified is zero.
@@ -133,11 +140,6 @@ use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt. NetBIOS scopes
 are <em>very</em> rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with.
-<p><br><a name="minush"></a>
-<li><strong><strong>-h</strong></strong> Prints the help information (usage) for smbd.
-<p><br><a name="minusP"></a>
-<li><strong><strong>-P</strong></strong> Passive option. Causes smbd not to send any network traffic
-out. Used for debugging by the developers only.
 <p><br></ul>
 <p><br><a name="FILES"></a>
 <h2>FILES</h2>
@@ -357,16 +359,11 @@ performance.
 <p><br><a name="SEEALSO"></a>
 <h2>SEE ALSO</h2>
     
-<p><br><strong>hosts_access (5)</strong>,
+<p><br><strong>hosts_access (5)</strong>, <strong>inetd (8)</strong>, <a href="nmbd.8.html"><strong>nmbd (8)</strong></a>,
-<strong>inetd (8)</strong>,
+<a href="smb.conf.5.html"><strong>smb.conf (5)</strong></a>, <a href="smbclient.1.html"><strong>smbclient
-<a href="nmbd.8.html"><strong>nmbd (8)</strong></a>,
+(1)</strong></a>, <a href="testparm.1.html"><strong>testparm (1)</strong></a>,
-<a href="smb.conf.5.html"><strong>smb.conf (5)</strong></a>,
+<a href="testprns.1.html"><strong>testprns (1)</strong></a>, and the Internet RFC's
-<a href="smbclient.1.html"><strong>smbclient (1)</strong></a>,
+<strong>rfc1001.txt</strong>, <strong>rfc1002.txt</strong>. In addition the CIFS (formerly SMB)
-<a href="testparm.1.html"><strong>testparm (1)</strong></a>,
-<a href="testprns.1.html"><strong>testprns (1)</strong></a>,
-<a href="rpcclient.1.html"><strong>rpcclient (1)</strong></a>,
-and the Internet RFC's <strong>rfc1001.txt</strong>, <strong>rfc1002.txt</strong>.
-In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
 <a href="http://samba.org/cifs/">http://samba.org/cifs/</a>.
 <p><br><a name="AUTHOR"></a>

docs/htmldocs/swat.8.html

@@ -20,7 +20,7 @@
     
 <p><br><a name="NAME"></a>
 <h2>NAME</h2>
-    swat - swat - Samba Web Administration Tool
+    swat - Samba Web Administration Tool
 <p><br><a name="SYNOPSIS"></a>
 <h2>SYNOPSIS</h2>
     

docs/htmldocs/testparm.1.html

@@ -24,7 +24,7 @@
 <p><br><a name="SYNOPSIS"></a>
 <h2>SYNOPSIS</h2>
      
-<p><br><strong>testparm</strong> [<a href="testparm.1.html#minuss">-s</a>] [<a href="testparm.1.html#configfilename">configfilename</a>] [<a href="testparm.1.html#hostname">hostname</a> <a href="testparm.1.html#hostIP">hostIP</a>]
+<p><br><strong>testparm</strong> [<a href="testparm.1.html#minuss">-s</a>] [<a href="testparm.1.html#minush">-h</a>] [<a href="testparm.1.html#minusL">-L servername</a>] [<a href="testparm.1.html#configfilename">configfilename</a>] [<a href="testparm.1.html#hostname">hostname</a> <a href="testparm.1.html#hostIP">hostIP</a>]
 <p><br><a name="DESCRIPTION"></a>
 <h2>DESCRIPTION</h2>
     
@@ -39,6 +39,10 @@ configuration file will be available or will operate as expected.
 <p><br>If the optional host name and host IP address are specified on the
 command line, this test program will run through the service entries
 reporting whether the specified host has access to each service.
+<p><br>If <strong>testparm</strong> finds an error in the <a href="smb.conf.5.html"><strong>smb.conf</strong></a>
+file it returns an exit code of 1 to the calling program, else it returns
+an exit code of 0. This allows shell scripts to test the output from
+<strong>testparm</strong>.
 <p><br><a name="OPTIONS"></a>
 <h2>OPTIONS</h2>
     
@@ -47,6 +51,11 @@ reporting whether the specified host has access to each service.
 <li><strong><strong>-s</strong></strong> Without this option, <strong>testparm</strong> will prompt for a
 carriage return after printing the service names and before dumping
 the service definitions.
+<p><br><a name="minush"></a>
+<li><strong><strong>-h</strong></strong> Print usage message
+<p><br><a name="minusL"></a>
+<li><strong><strong>-L servername</strong></strong> Sets the value of the %L macro to servername. This
+is useful for testing include files specified with the %L macro.
 <p><br><a name="configfilename"></a>
 <li><strong><strong>configfilename</strong></strong> This is the name of the configuration file to
 check. If this parameter is not present then the default

docs/manpages/nmbd.8

@@ -6,7 +6,7 @@ naming services to clients
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBnmbd\fP [-D] [-o] [-a] [-H lmhosts file] [-d debuglevel] [-l log file basename] [-n primary NetBIOS name] [-p port number] [-s configuration file] [-i NetBIOS scope] [-h]
+\fBnmbd\fP [-D] [-a] [-o] [-h] [-V] [-H lmhosts file] [-d debuglevel] [-l log file basename] [-n primary NetBIOS name] [-p port number] [-s configuration file] [-i NetBIOS scope]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -59,6 +59,12 @@ If this parameter is specified, the log files will be
 overwritten when opened\&.  By default, the log files will be appended
 to\&.
 .IP 
+.IP "\fB-h\fP" 
+Prints the help information (usage) for \fBnmbd\fP\&.
+.IP 
+.IP "\fB-V\fP" 
+Prints the version number for \fBnmbd\fP\&.
+.IP 
 .IP "\fB-H filename\fP" 
 NetBIOS lmhosts file\&.
 .IP 
@@ -138,9 +144,6 @@ are \fIvery\fP rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with\&.
 .IP 
-.IP "\fB-h\fP" 
-Prints the help information (usage) for \fBnmbd\fP\&.
-.IP 
 .PP 
 .SH "FILES" 
 .PP 

docs/manpages/nmblookup.1

@@ -5,7 +5,7 @@ nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBnmblookup\fP [-M] [-R] [-S] [-r] [-A] [-h] [-B broadcast address] [-U unicast address] [-d debuglevel] [-s smb config file] [-i NetBIOS scope] name
+\fBnmblookup\fP [-M] [-R] [-S] [-r] [-A] [-h] [-B broadcast address] [-U unicast address] [-d debuglevel] [-s smb config file] [-i NetBIOS scope] [-T] name
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -20,8 +20,9 @@ or to a particular machine\&. All queries are done over UDP\&.
 .PP 
 .IP 
 .IP "\fB-M\fP" 
-Searches for a master browser\&. This is done by doing a
+Searches for a master browser by looking up the 
-broadcast lookup on the special name \f(CW__MSBROWSE__\fP\&.
+NetBIOS name \fBname\fP with a type of 0x1d\&. If \fBname\fP
+is \f(CW"-"\fP then it does a lookup on the special name \f(CW__MSBROWSE__\fP\&.
 .IP 
 .IP "\fB-R\fP" 
 Set the recursion desired bit in the packet to do a
@@ -55,8 +56,8 @@ Print a help (usage) message\&.
 .IP "\fB-B broadcast address\fP" 
 Send the query to the given broadcast
 address\&. Without this option the default behavior of nmblookup is to
-send the query to the broadcast address of the primary network
+send the query to the broadcast address of the network
-interface as either auto-detected or defined in the 
+interfaces as either auto-detected or defined in the 
 \fBinterfaces\fP parameter of the 
 \fBsmb\&.conf (5)\fP file\&.
 .IP 
@@ -97,6 +98,12 @@ are \fIvery\fP rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with\&.
 .IP 
+.IP "\fB-T\fP" 
+This causes any IP addresses found in the lookup to be
+looked up via a reverse DNS lookup into a DNS name, and printed out
+before each \f(CW"IP address   NetBIOS name"\fP pair that is the normal
+output\&.
+.IP 
 .IP "\fBname\fP" 
 This is the NetBIOS name being queried\&. Depending upon
 the previous options this may be a NetBIOS name or IP address\&. If a

docs/manpages/samba.7

@@ -50,18 +50,6 @@ servers (such as Windows NT), and can also be used to allow a UNIX box
 to print to a printer attached to any SMB server (such as a PC running
 Windows NT)\&.
 .IP 
-.IP "\fBrpcclient\fP" 
-.br 
-.br 
-The \fBrpcclient\fP
-(1) program is a client that can \'talk\' to an
-SMB/CIFS MSRPC server\&.  Operations include things like managing a SAM
-Database (users, groups and aliases) in the same way as the Windows NT
-programs \fBUser Manager for Domains\fP and \fBServer Manager for Domains\fP;
-managing a remote registry in the same way as the Windows NT programs
-\fBREGEDT32\&.EXE\fP and \fBREGEDIT\&.EXE\fP; viewing a remote event log (same
-as \fBEVENTVWR\&.EXE\fP)\&.
-.IP 
 .IP "\fBtestparm\fP" 
 .br 
 .br 

docs/manpages/smbclient.1

@@ -5,7 +5,7 @@ smbclient \- ftp-like client to access SMB/CIFS resources on servers
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBsmbclient\fP servicename [password] [-s smb\&.conf] [-B IP addr] [-O socket options][-R name resolve order] [-M NetBIOS name] [-i scope] [-N] [-n NetBIOS name] [-d debuglevel] [-P] [-p port] [-l log basename] [-h] [-I dest IP] [-E] [-U username] [-L NetBIOS name] [-t terminal code] [-m max protocol] [-W workgroup] [-T<c|x>IXFqgbNan] [-D directory] [-c command string]
+\fBsmbclient\fP servicename [-s smb\&.conf] [-O socket options][-R name resolve order] [-M NetBIOS name] [-i scope] [-N] [-n NetBIOS name] [-d debuglevel] [-P] [-p port] [-l log basename] [-h] [-I dest IP] [-E] [-U username] [-L NetBIOS name] [-t terminal code] [-m max protocol] [-b buffersize] [-W workgroup] [-T<c|x>IXFqgbNan] [-D directory] [-c command string]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -65,9 +65,6 @@ Samba configuration file, smb\&.conf\&. This file controls all aspects of
 the Samba setup on the machine and smbclient also needs to read this
 file\&.
 .IP 
-.IP "\fB-B IP addr\fP" 
-The IP address to use when sending a broadcast packet\&.
-.IP 
 .IP "\fB-O socket options\fP" 
 TCP socket options to set on the client
 socket\&. See the socket options
@@ -104,8 +101,7 @@ no WINS server has been specified this method will be ignored\&.
 listed in the \fBinterfaces\fP parameter
 in the smb\&.conf file\&. This is the least reliable of the name resolution
 methods as it depends on the target host being on a locally connected
-subnet\&. To specify a particular broadcast address the \fB-B\fP option 
+subnet\&. 
-may be used\&.
 .IP 
 .IP 
 If this parameter is not set then the name resolve order defined
@@ -284,7 +280,7 @@ nothing before or nothing after the percent symbol will cause an empty
 username or an empty password to be used, respectively\&.
 .IP 
 The password may also be specified by setting up an environment
-variable called \f(CWPASSWORD\fP that contains the users password\&. Note
+variable called \f(CWPASSWD\fP that contains the users password\&. Note
 that this may be very insecure on some systems but on others allows
 users to script smbclient commands without having a password appear in
 the command line of a process listing\&.
@@ -294,7 +290,7 @@ on an uppercase password\&. Lowercase or mixed case passwords may be
 rejected by these servers\&.
 .IP 
 Be cautious about including passwords in scripts or in the
-\f(CWPASSWORD\fP environment variable\&. Also, on many systems the command
+\f(CWPASSWD\fP environment variable\&. Also, on many systems the command
 line of a running process may be seen via the \f(CWps\fP command to be
 safe always allow smbclient to prompt for a password and type it in
 directly\&.
@@ -326,6 +322,12 @@ protocols level the server supports\&. This parameter is
 preserved for backwards compatibility, but any string
 following the \fB-m\fP will be ignored\&.
 .IP 
+.IP "\fB-b buffersize\fP" 
+This option changes the transmit/send buffer
+size when getting or putting a file from/to the server\&. The default
+is 65520 bytes\&. Setting this value smaller (to 1200 bytes) has been
+observed to speed up file transfers to and from a Win9x server\&.
+.IP 
 .IP "\fB-W WORKGROUP\fP" 
 Override the default workgroup specified in the
 \fBworkgroup\fP parameter of the
@@ -717,7 +719,7 @@ The variable \fBUSER\fP may contain the username of the person using the
 client\&.  This information is used only if the protocol level is high
 enough to support session-level passwords\&.
 .PP 
-The variable \fBPASSWORD\fP may contain the password of the person using
+The variable \fBPASSWD\fP may contain the password of the person using
 the client\&.  This information is used only if the protocol level is
 high enough to support session-level passwords\&.
 .PP 

docs/manpages/smbd.8

@@ -5,7 +5,7 @@ smbd \- server to provide SMB/CIFS services to clients
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBsmbd\fP [-D] [-a] [-o] [-d debuglevel] [-l log file] [-p port number] [-O socket options] [-s configuration file] [-i scope] [-P] [-h]
+\fBsmbd\fP [-D] [-a] [-o] [-P] [-h] [-V] [-d debuglevel] [-l log file] [-p port number] [-O socket options] [-s configuration file] [-i scope]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -65,6 +65,16 @@ If this parameter is specified, the log files will be
 overwritten when opened\&.  By default, the log files will be appended
 to\&.
 .IP 
+.IP "\fB-P\fP" 
+Passive option\&. Causes smbd not to send any network traffic
+out\&. Used for debugging by the developers only\&.
+.IP 
+.IP "\fB-h\fP" 
+Prints the help information (usage) for \fBsmbd\fP\&.
+.IP 
+.IP "\fB-V\fP" 
+Prints the version number for \fBsmbd\fP\&.
+.IP 
 .IP "\fB-d debuglevel\fP" 
 debuglevel is an integer from 0 to 10\&.
 .IP 
@@ -135,13 +145,6 @@ are \fIvery\fP rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with\&.
 .IP 
-.IP "\fB-h\fP" 
-Prints the help information (usage) for smbd\&.
-.IP 
-.IP "\fB-P\fP" 
-Passive option\&. Causes smbd not to send any network traffic
-out\&. Used for debugging by the developers only\&.
-.IP 
 .PP 
 .SH "FILES" 
 .PP 
@@ -409,16 +412,11 @@ performance\&.
 .PP 
 .SH "SEE ALSO" 
 .PP 
-\fBhosts_access (5)\fP,
+\fBhosts_access (5)\fP, \fBinetd (8)\fP, \fBnmbd (8)\fP,
-\fBinetd (8)\fP,
+\fBsmb\&.conf (5)\fP, \fBsmbclient
-\fBnmbd (8)\fP,
+(1)\fP, \fBtestparm (1)\fP,
-\fBsmb\&.conf (5)\fP,
+\fBtestprns (1)\fP, and the Internet RFC\'s
-\fBsmbclient (1)\fP,
+\fBrfc1001\&.txt\fP, \fBrfc1002\&.txt\fP\&. In addition the CIFS (formerly SMB)
-\fBtestparm (1)\fP,
-\fBtestprns (1)\fP,
-\fBrpcclient (1)\fP,
-and the Internet RFC\'s \fBrfc1001\&.txt\fP, \fBrfc1002\&.txt\fP\&.
-In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
 http://samba\&.org/cifs/\&.
 .PP 

docs/manpages/smbmnt.8

@@ -1,96 +1,37 @@
-.TH SMBMNT 8 "13 Nov 1998" "smbmnt 2.0.0-beta1"
+.TH "smbmnt " "1" "25 September 1999" "Samba" "SAMBA" 
-.SH NAME
+.PP 
-smbmnt \- mount smb file system
+.SH "NAME" 
-.SH SYNOPSIS
+smbmnt \- helper utility for mounting SMB filesystems
-.B smbmnt
+.PP 
-.B mount-point
+.SH "SYNOPSIS" 
-[
+\fBsmbmnt\fP mount-point [ -s share ] [ -r ] [ -u uid ] [ -g gid ] [ -f mask ] [ -d mask ] 
-.B -u
+.PP 
-.I uid
+.SH "DESCRIPTION" 
-] [
+.PP 
-.B -g
+smbmnt is a helper application used by the smbmount program to do the
-.I gid
+actual mounting of SMB shares\&. smbmnt is meant to be installed setuid
-] [
+root so that normal users can mount their smb shares\&. It checks
-.B -f
+whether the user has write permissions on the mount point and then
-.I file mode
+mounts the directory\&.
-] [
+.PP 
-.B -d
+The smbmnt program is normally invoked by smbmount\&. It should not be
-.I dir mode
+invoked directly by users\&.
-]
+.PP 
-
+.IP "\fB-r\fP" 
-.SH DESCRIPTION
+mount the filesystem read-only
-.B smbmnt 
+.PP 
-is a helper application used by the 
+.IP "\fB-u uid\fP" 
-.BI smbmount (8)
+specify the uid that the files will be owned by
-program to do the actual mounting.
+.PP 
-.B smbmnt
+.IP "\fB-g gid\fP" 
-is meant to be installed setuid root so that normal users can mount
+specify the gid that the files will be owned by
-their smb shares. It checks whether the user has write permissions
+.PP 
-on the mount point and then mounts the directory.
+.IP "\fB-f mask\fP" 
-
+specify the octal file mask applied 
-The
+.PP 
-.B smbmnt
+.IP "\fB-d mask\fP" 
-program is normally invoked by a mount command to
+specify the octal directory mask applied 
-.BI smbmount ,
+.PP 
-and the command line arguments are passed directly to
+.SH "AUTHOR" 
-.B smbmnt.
+The maintainer of smbfs, smbmnt and smbmount is Andrew Tridgell
-
+\fItridge@samba\&.org\fP
-.SH OPTIONS
-.B -u
-.I uid,
-.B -g
-.I gid
-.RS 3
-A Lan Manager server does not tell us anything about the owner of a
-file, but Unix requires that each file have an owner and a group it belongs
-to. With 
-.B -u
-and
-.B -g
-you can tell smbmount which id's it should assign to the files in the
-mounted directory.
-
-The defaults for these values are the current uid and gid.
-.RE
-
-.B -f
-.I file mode,
-.B -d
-.I dir mode
-.RS 3
-Like 
-.B -u
-and
-.B -g,
-these options are also used to bridge differences in concepts between
-Lan Manager and Unix. Lan Manager does not know anything about file
-permissions, so
-.B smbmnt
-must be told which permissions it should assign to the mounted files
-and directories.
-
-The values must be given as octal numbers. The default values are taken
-from the current umask, where the file mode is the current umask,
-and the dir mode adds execute permissions where the file mode gives
-read permissions.
-
-Note that these permissions can differ from the rights the server
-gives to us. If you do not have write permissions on the server,
-you should choose a file mode that matches your actual permissions.
-This certainly cannot override the restrictions imposed by the server.
-
-In addition to specifying the file mode, the
-.B -f
-argument can be used to specify certain bug-fix workarounds.
-This allows bug fixes to be enabled on a per mount-point basis,
-rather than being compiled into the kernel.
-The required bug fixes are specified by prepending an (octal) value
-to the file mode.
-For information on the available bug workarounds, refer to the
-.B smbfs.txt
-file in the Linux kernel Documentation directory. 
-.RE
-
-.SH SEE ALSO
-.B smbmount(8)
-

docs/manpages/smbmount.8

@@ -1,44 +1,87 @@
-.TH SMBMOUNT 8 "13 Nov 1998" "smbmount 2.0.0-beta1"
+.TH "smbmount " "1" "25 September 1999" "Samba" "SAMBA" 
-.SH NAME
+.PP 
-smbmount \- mount smb file system
+.SH "NAME" 
-.SH SYNOPSIS
+smbmount \- mount an SMB filesystem
-.B smbmount
+.PP 
-[
+.SH "SYNOPSIS" 
-.B options
+\fBsmbmount\fP service mountpoint [ -o options ]
-]
+.PP 
-
+.SH "DESCRIPTION" 
-.SH DESCRIPTION
+.PP 
-.B smbmount 
+smbmount mounts a SMB filesystem\&. It is usually invoked as mount\&.smb
-is a stripped-down version of the 
+from the mount(8) command when using the "-t smb" option\&. The kernel
-.BI smbclient (1)
+must support the smbfs filesystem\&.
-program used to mount smbfs shares. It implements only the mount command,
+.PP 
-which then calls the
+Options to smbmount are specified as a comma separated list of
-.BI smbmnt (8)
+key=value pairs\&. 
-program to do the actual mount.
+.PP 
-.B smbmount
+NOTE: smbmount calls smbmnt to do the actual mount\&. You must make sure
-itself accepts most of the options that
+that smbmnt is in the path so that it can be found\&.
-.B smbclient
+.PP 
-does. See the
+.IP "\fBusername=<arg>\fP" 
-.BI smbclient (1)
+specifies the username to connect as\&. If this is
-manpage for details.
+not given then the environment variable USER is used\&. This option can
-
+also take the form user%password or user/workgroup or
-To mount an smb file system, I suggest using the option
+user/workgroup%password to allow the password and workgroup to be
-.B -c
+specified as part of the username\&.
-for smbmount to pass the mount command. For example, use
+.IP 
-
+.IP "\fBpassword=<arg>\fP" 
-smbmount '\\\\server\\tmp' -c 'mount /mnt -u 123 -g 456'
+specifies the SMB password\&. If not given then
-
+smbmount will prompt for a passeword, unless the guest option is
-to mount the tmp share of server on /mnt, giving it a local uid 123
+given\&.
-and a local gid 456.
+.IP 
-
+.IP "\fBnetbiosname=<arg>\fP" 
-The arguments supplied to the mount command are passed directly to the
+sets the source NetBIOS name\&. It defaults to
-.B smbmnt
+the local hostname\&.
-utility for processing.
+.IP 
-Refer to the
+.IP "\fBuid=<arg>\fP" 
-.BI smbmnt (8)
+sets the uid that files will be mounted as\&. It may be
-manpage for details.
+specified as either a username or a numeric uid\&.
-
+.IP 
-.SH SEE ALSO
+.IP "\fBgid=<arg>\fP" 
-.BI smbmnt (8),
+sets the gid that files will be mounted as\&. It may be
-.BI smbclient (1)
+specified as either a groupname or a numeric gid\&.
-
+.IP 
+.IP "\fBport=<arg>\fP" 
+sets the remote SMB port number\&. The default is 139\&.
+.IP 
+.IP "\fBfmask=<arg>\fP" 
+sets the file mask\&. This deterines the permissions
+that remote files have in the local filesystem\&. The default is based
+on the current umask\&.
+.IP 
+.IP "\fBdmask=<arg>\fP" 
+sets the directory mask\&. This deterines the
+permissions that remote directories have in the local filesystem\&. The
+default is based on the current umask\&.
+.IP 
+.IP "\fBdebug=<arg>\fP" 
+sets the debug level\&. This is useful for tracking
+down SMB connection problems\&.
+.IP 
+.IP "\fBip=<arg>\fP" 
+sets the destination host or IP address\&.
+.IP 
+.IP "\fBworkgroup=<arg>\fP" 
+sets the workgroup on the destination
+.IP 
+.IP "\fBsockopt=<arg>\fP" 
+sets the TCP socket options\&. See the smb\&.conf
+"socket options" option\&.
+.IP 
+.IP "\fBscope=<arg>\fP" 
+sets the NetBIOS scope
+.IP 
+.IP "\fBguest\fP" 
+don\'t prompt for a password
+.IP 
+.IP "\fBro\fP" 
+mount read-only
+.IP 
+.IP "\fBrw\fP" 
+mount read-write
+.IP 
+.PP 
+.SH "AUTHOR" 
+The maintainer of smbfs, smbmnt and smbmount is Andrew Tridgell
+\fItridge@samba\&.org\fP

docs/manpages/smbumount.8

@@ -1,4 +1,4 @@
-.TH SMBUMOUNT 8 "13 Nov 1998" "smbumount 2.0.0-beta1"
+.TH SMBUMOUNT 8 "18 May 1999" "smbumount 2.0.4"
 .SH NAME
 smbumount \- umount for normal users
 .SH SYNOPSIS

docs/manpages/swat.8

@@ -1,7 +1,7 @@
 .TH "swat " "8" "23 Oct 1998" "Samba" "SAMBA" 
 .PP 
 .SH "NAME" 
-swat \- swat - Samba Web Administration Tool
+swat \- Samba Web Administration Tool
 .PP 
 .SH "SYNOPSIS" 
 .PP 

docs/manpages/testparm.1

@@ -5,7 +5,7 @@ testparm \- check an smb\&.conf configuration file for internal correctness
 .PP 
 .SH "SYNOPSIS" 
 .PP 
-\fBtestparm\fP [-s] [configfilename] [hostname hostIP]
+\fBtestparm\fP [-s] [-h] [-L servername] [configfilename] [hostname hostIP]
 .PP 
 .SH "DESCRIPTION" 
 .PP 
@@ -24,6 +24,11 @@ If the optional host name and host IP address are specified on the
 command line, this test program will run through the service entries
 reporting whether the specified host has access to each service\&.
 .PP 
+If \fBtestparm\fP finds an error in the \fBsmb\&.conf\fP
+file it returns an exit code of 1 to the calling program, else it returns
+an exit code of 0\&. This allows shell scripts to test the output from
+\fBtestparm\fP\&.
+.PP 
 .SH "OPTIONS" 
 .PP 
 .IP 
@@ -32,6 +37,13 @@ Without this option, \fBtestparm\fP will prompt for a
 carriage return after printing the service names and before dumping
 the service definitions\&.
 .IP 
+.IP "\fB-h\fP" 
+Print usage message
+.IP 
+.IP "\fB-L servername\fP" 
+Sets the value of the %L macro to servername\&. This
+is useful for testing include files specified with the %L macro\&.
+.IP 
 .IP "\fBconfigfilename\fP" 
 This is the name of the configuration file to
 check\&. If this parameter is not present then the default

docs/samba.lsm

@@ -1,14 +1,14 @@
 Begin2
 Title        = Samba
-Version      = 2.0
+Version      = 1.8.0
 Desc1        = Samba is a SMB based file and print server for unix. It
 Desc2        = provides access to unix file and print services from
 Desc3        = SMB compatible clients such as WinNT, WfWg, OS/2
 Desc4        = and Pathworks. It also includes a ftp-style unix client
 Desc5        = and a netbios nameserver.
-Author       = Samba Team
+Author       = Andrew Tridgell
 AuthorEmail  = samba-bugs@samba.org
-Maintainer   = Samba Team
+Maintainer   = Andrew Tridgell
 MaintEmail   = samba-bugs@samba.org
 Site1        = samba.org
 Path1        = pub/samba/
@@ -18,8 +18,9 @@ Required1    = Ansi-C compiler and a TCP/IP network.
 CopyPolicy1  = GNU Public License
 Keywords     = LanManager, SMB, Networking
 Comment1     = To join the Samba mailing list send mail to 
-Comment2     = listproc@samba.org with a body of
+Comment2     = listproc@listproc.anu.edu.au with a body of
 Comment3     = "subscribe samba Your Name"
-Entered      = November 1998
+Entered      = October 1994
 EnteredBy    = Andrew Tridgell
 End
+

docs/textdocs/Application_Serving.txt

@@ -1,5 +1,5 @@
 !==
-!== Application_Serving.txt for Samba release 2.1.0prealpha 981204
+!== Application_Serving.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributed:	January 7, 1997
 Updated:	March 24, 1998

docs/textdocs/BROWSING-Config.txt

@@ -1,5 +1,5 @@
 !==
-!== BROWSING-Config.txt for Samba release 2.1.0prealpha 981204
+!== BROWSING-Config.txt for Samba release 2.0.4 18 May 1999
 !==
 Date:		July 5, 1998
 Contributor:	John H Terpstra <jht@samba.org>

docs/textdocs/BROWSING.txt

@@ -1,5 +1,5 @@
 !==
-!== BROWSING.txt for Samba release 2.1.0prealpha 981204
+!== BROWSING.txt for Samba release 2.0.4 18 May 1999
 !==
 Author/s:	Many (Thanks to Luke, Jeremy, Andrew, etc.)
 Updated:	July 5, 1998

docs/textdocs/BUGS.txt

@@ -1,5 +1,5 @@
 !==
-!== BUGS.txt for Samba release 2.1.0prealpha 981204
+!== BUGS.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Samba Team
 Updated:	June 27, 1997

docs/textdocs/CVS_ACCESS.txt

@@ -1,5 +1,5 @@
 !==
-!== CVS_ACCESS.txt for Samba release 2.1.0prealpha 981204
+!== CVS_ACCESS.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:    Modified from the Web pages by Jeremy Allison.
 Date:           23 Dec 1997

docs/textdocs/DHCP-Server-Configuration.txt

@@ -1,5 +1,5 @@
 !==
-!== DHCP-Server-Configuration.txt for Samba release 2.1.0prealpha 981204
+!== DHCP-Server-Configuration.txt for Samba release 2.0.4 18 May 1999
 !==
 Subject:	DHCP Server Configuration for SMB Clients
 Date:		March 1, 1998

docs/textdocs/DIAGNOSIS.txt

@@ -1,8 +1,8 @@
 !==
-!== DIAGNOSIS.txt for Samba release 2.1.0prealpha 981204
+!== DIAGNOSIS.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Andrew Tridgell
-Updated:	October 14, 1997
+Updated:	November 1, 1999
 
 Subject:	DIAGNOSING YOUR SAMBA SERVER
 ===========================================================================
@@ -16,9 +16,6 @@ You should do ALL the tests, in the order shown. I have tried to
 carefully choose them so later tests only use capabilities verified in
 the earlier tests.
 
-I would welcome additions to this set of tests. Please mail them to
-samba-bugs@samba.org
-
 If you send me an email saying "it doesn't work" and you have not
 followed this test procedure then you should not be surprised if I
 ignore your email.
@@ -28,9 +25,10 @@ ASSUMPTIONS
 -----------
 
 In all of the tests I assume you have a Samba server called BIGSERVER
-and a PC called ACLIENT. I also assume the PC is running windows for
+and a PC called ACLIENT both in workgroup TESTGROUP. I also assume the
-workgroups with a recent copy of the microsoft tcp/ip stack. Alternatively,
+PC is running windows for workgroups with a recent copy of the
-your PC may be running Windows 95 or Windows NT (Workstation or Server).
+microsoft tcp/ip stack. Alternatively, your PC may be running Windows
+95 or Windows NT (Workstation or Server).
 
 The procedure is similar for other types of clients.
 
@@ -44,7 +42,7 @@ smb.conf. I will assume this share is called "tmp". You can add a
  read only = yes
 
 
-THESE TESTS ASSUME VERSION 1.9.16 OR LATER OF THE SAMBA SUITE. SOME
+THESE TESTS ASSUME VERSION 2.0.6 OR LATER OF THE SAMBA SUITE. SOME
 COMMANDS SHOWN DID NOT EXIST IN EARLIER VERSIONS
 
 Please pay attention to the error messages you receive. If any error message
@@ -102,7 +100,7 @@ valid. Check what your guest account is using "testparm" and
 temporarily remove any "hosts allow", "hosts deny", "valid users" or
 "invalid users" lines.
 
-If you get a "connection refused" response then the smbd server could
+If you get a "connection refused" response then the smbd server may
 not be running. If you installed it in inetd.conf then you probably edited
 that file incorrectly. If you installed it as a daemon then check that
 it is running, and check that the netbios-ssn port is in a LISTEN
@@ -170,6 +168,9 @@ You should get the PCs IP address back. If you don't then the client
 software on the PC isn't installed correctly, or isn't started, or you
 got the name of the PC wrong. 
 
+If ACLIENT doesn't resolve via DNS then use the IP address of the
+client in the above test.
+
 
 TEST 6:
 -------
@@ -199,11 +200,15 @@ not correct. (Refer to TEST 3 notes above).
 TEST 7:
 -------
 
-Run the command "smbclient '\\BIGSERVER\TMP'". You should then be
+Run the command "smbclient //BIGSERVER/TMP". You should then be
 prompted for a password. You should use the password of the account
 you are logged into the unix box with. If you want to test with
-another account then add the -U <accountname> option to the command
+another account then add the -U <accountname> option to the end of
-line. 
+the command line.  eg: smbclient //bigserver/tmp -Ujohndoe
+
+Note: It is possible to specify the password along with the username
+as follows:
+	smbclient //bigserver/tmp -Ujohndoe%secret
 
 Once you enter the password you should get the "smb>" prompt. If you
 don't then look at the error message. If it says "invalid network
@@ -250,6 +255,12 @@ same fixes apply as they did for the "smbclient -L" test above. In
 particular, make sure your "hosts allow" line is correct (see the man
 pages)
 
+Also, do not overlook that fact that when the workstation requests the
+connection to the samba server it will attempt to connect using the 
+name with which you logged onto your Windows machine. You need to make
+sure that an account exists on your Samba server with that exact same
+name and password.
+
 If you get "specified computer is not receiving requests" or similar
 it probably means that the host is not contactable via tcp services.
 Check to see if the host is running tcp wrappers, and if so add an entry in
@@ -271,10 +282,23 @@ USERNAME" to the [tmp] section of smb.conf where "USERNAME" is the
 username corresponding to the password you typed. If you find this
 fixes things you may need the username mapping option.
 
-
 TEST 10:
 --------
 
+Run the command "nmblookup -M TESTGROUP" where TESTGROUP is the name
+of the workgroup that your Samba server and Windows PCs belong to. You
+should get back the IP address of the master browser for that
+workgroup.
+
+If you don't then the election process has failed. Wait a minute to
+see if it is just being slow then try again. If it still fails after
+that then look at the browsing options you have set in smb.conf. Make
+sure you have "preferred master = yes" to ensure that an election is
+held at startup.
+
+TEST 11:
+--------
+
 From file manager try to browse the server. Your samba server should
 appear in the browse list of your local workgroup (or the one you
 specified in smb.conf). You should be able to double click on the name

docs/textdocs/DNIX.txt

@@ -1,5 +1,5 @@
 !==
-!== DNIX.txt for Samba release 2.1.0prealpha 981204
+!== DNIX.txt for Samba release 2.0.4 18 May 1999
 !==
 DNIX has a problem with seteuid() and setegid(). These routines are
 needed for Samba to work correctly, but they were left out of the DNIX

docs/textdocs/DOMAIN.txt

@@ -1,5 +1,5 @@
 !==
-!== DOMAIN.txt for Samba release 2.1.0prealpha 981204
+!== DOMAIN.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Samba Team
 Updated:	December 4, 1998 (John H Terpstra)

docs/textdocs/DOMAIN_CONTROL.txt

@@ -1,5 +1,5 @@
 !==
-!== DOMAIN_CONTROL.txt for Samba release 2.1.0prealpha 981204
+!== DOMAIN_CONTROL.txt for Samba release 2.0.4 18 May 1999
 !==
 Initial Release:	August 22, 1996
 Contributor:		John H Terpstra <samba-bugs@samba.org>

docs/textdocs/DOMAIN_MEMBER.txt

@@ -1,7 +1,7 @@
 
 TITLE INFORMATION: Joining an NT Domain with Samba 2.0 
 AUTHOR INFORMATION: Jeremy Allison, Samba Team 
-DATE INFORMATION: 11th November 1998 
+DATE INFORMATION: 7th October 1999 
 
 Contents 
 
@@ -11,7 +11,8 @@ Joining an NT Domain with Samba 2.0
 In order for a Samba-2 server to join an NT domain, you must first add
 the NetBIOS name of the Samba server to the NT domain on the PDC using
 Server Manager for Domains.  This creates the machine account in the
-domain (PDC) SAM.
+domain (PDC) SAM. Note that you should add the Samba server as a "Windows
+NT Workstation or Server", NOT as a Primary or backup domain controller.
 
 Assume you have a Samba-2 server with a NetBIOS name of SERV1 and are
 joining an NT domain called DOM, which has a PDC with a NetBIOS name
@@ -75,6 +76,10 @@ workgroup = DOM
 
 as this is the name of the domain we are joining. 
 
+You must also have the parameter "encrypt passwords"
+set to "yes" in order for your users to authenticate to the
+NT PDC.
+
 Finally, add (or modify) a:
 
 "password server ="
@@ -89,19 +94,15 @@ each of these servers in order, so you may want to rearrange this list
 in order to spread out the authentication load among domain
 controllers.
 
-Currently, Samba requires that a defined list of domain controllers be
+Alternatively, if you want smbd to automatically determine the
-listed in this parameter in order to authenticate with domain-level
+list of Domain controllers to use for authentication, you may set this line to be :
-security. NT does not use this method, and will either broadcast or
-use a WINS database in order to find domain controllers to
-authenticate against.
 
-Originally, I considered this idea for Samba, but dropped it because
+password server = *
-it seemed so insecure.  However several Samba-2 alpha users have
+
-requested that this feature be added to make Samba more NT-like, so
+This method, which is new in Samba 2.0.6 and above, allows Samba
-I'll probably add a special name of '*' (which means: act like NT
+to use exactly the same mechanism that NT does. This method either broadcasts or
-when looking for domain controllers) in a future release of the
+uses a WINS database in order to find domain controllers to
-code. At present, however, you need to know where your domain
+authenticate against.
-controllers are.
 
 Finally, restart your Samba daemons and get ready for clients to begin
 using domain security!

docs/textdocs/ENCRYPTION.txt

@@ -1,8 +1,8 @@
 !==
-!== ENCRYPTION.txt for Samba release 2.1.0prealpha 981204
+!== ENCRYPTION.txt for Samba release 2.0.5a 22 Jul 1999
 !==
 Contributor:	Jeremy Allison <samba-bugs@samba.org>
-Updated:	March 19, 1998
+Updated:	April 19, 1999
 Note:		Please refer to WinNT.txt also
 
 Subject:	LanManager / Samba Password Encryption.
@@ -22,7 +22,7 @@ How does it work ?
 
 LanManager encryption is somewhat similar to UNIX password
 encryption. The server uses a file containing a hashed value of a
-users password.  This is created by taking the users plaintext
+user's password.  This is created by taking the user's plaintext
 password, capitalising it, and either truncating to 14 bytes (or
 padding to 14 bytes with null bytes). This 14 byte value is used as
 two 56 bit DES keys to encrypt a 'magic' eight byte value, forming a
@@ -30,7 +30,7 @@ two 56 bit DES keys to encrypt a 'magic' eight byte value, forming a
 be known as the *hashed password*.
 
 Windows NT encryption is a higher quality mechanism, consisting
-of doing an MD4 hash on a Unicode version of the users password. This
+of doing an MD4 hash on a Unicode version of the user's password. This
 also produces a 16 byte hash value that is non-reversible.
 
 When a client (LanManager, Windows for WorkGroups, Windows 95 or
@@ -51,10 +51,10 @@ In the SMB call SMBsessionsetupX (when user level security is
 selected) or the call SMBtconX (when share level security is selected)
 the 24 byte response is returned by the client to the Samba server.
 For Windows NT protocol levels the above calculation is done on
-both hashes of the users password and both responses are returned
+both hashes of the user's password and both responses are returned
 in the SMB call, giving two 24 byte values.
 
-The Samba server then reproduces the above calculation, using it's own
+The Samba server then reproduces the above calculation, using its own
 stored value of the 16 byte hashed password (read from the smbpasswd
 file - described later) and the challenge value that it kept from the
 negotiate protocol reply. It then checks to see if the 24 byte value it
@@ -62,11 +62,11 @@ calculates matches the 24 byte value returned to it from the client.
 
 If these values match exactly, then the client knew the correct
 password (or the 16 byte hashed value - see security note below) and
-is this allowed access. If not then the client did not know the
+is thus allowed access. If not, then the client did not know the
 correct password and is denied access.
 
 Note that the Samba server never knows or stores the cleartext of the
-users password - just the 16 byte hashed values derived from it. Also
+user's password - just the 16 byte hashed values derived from it. Also
 note that the cleartext password or 16 byte hashed values are never
 transmitted over the network - thus increasing security.
 
@@ -79,7 +79,7 @@ typically sends clear text passwords over the nextwork when logging
 in. This is bad. The SMB encryption scheme never sends the cleartext
 password over the network but it does store the 16 byte hashed values
 on disk. This is also bad. Why? Because the 16 byte hashed values are a
-"password equivalent". You cannot derive the users password from them,
+"password equivalent". You cannot derive the user's password from them,
 but they could potentially be used in a modified client to gain access
 to a server. This would require considerable technical knowledge on
 behalf of the attacker but is perfectly possible. You should thus
@@ -106,7 +106,7 @@ a network sniffer cannot just record passwords going to the SMB server.
 
 - WinNT doesn't like talking to a server that isn't using SMB
 encrypted passwords. It will refuse to browse the server if the server
-is also in user level security mode. It will insist on promting the
+is also in user level security mode. It will insist on prompting the
 user for the password on each connection, which is very annoying. The
 only things you can do to stop this is to use SMB encryption.
 
@@ -135,7 +135,7 @@ The smbpasswd file.
 In order for Samba to participate in the above protocol it must
 be able to look up the 16 byte hashed values given a user name.
 Unfortunately, as the UNIX password value is also a one way hash
-function (ie. it is impossible to retrieve the cleartext of the users
+function (ie. it is impossible to retrieve the cleartext of the user's
 password given the UNIX hash of it) then a separate password file
 containing this 16 byte value must be kept. To minimise problems with
 these two password files, getting out of sync, the UNIX /etc/passwd and
@@ -177,10 +177,11 @@ chmod 600 smbpasswd.
 
 The format of the smbpasswd file is
 
-username:uid:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:Long name:user home dir:user shell
+username:uid:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[Account type]:LCT-<last-change-time>:Long name
 
-Although only the username, uid, and XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+Although only the username, uid, XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX,
-sections are significant and are looked at in the Samba code.
+[Account type] and last-change-time sections are significant and
+are looked at in the Samba code.
 
 It is *VITALLY* important that there by 32 'X' characters between the
 two ':' characters in the XXX sections - the smbpasswd and Samba code 
@@ -192,7 +193,7 @@ When the password file is created all users have password entries
 consisting of 32 'X' characters. By default this disallows any access
 as this user. When a user has a password set, the 'X' characters change
 to 32 ascii hexadecimal digits (0-9, A-F). These are an ascii
-representation of the 16 byte hashed value of a users password.
+representation of the 16 byte hashed value of a user's password.
 
 To set a user to have no password (not recommended), edit the file
 using vi, and replace the first 11 characters with the asci text
@@ -202,7 +203,7 @@ NO PASSWORD
 Eg. To clear the password for user bob, his smbpasswd file entry would
 look like :
 
-bob:100:NO PASSWORDXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:Bob's full name:/bobhome:/bobshell
+bob:100:NO PASSWORDXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U          ]:LCT-00000000:Bob's full name:/bobhome:/bobshell
 
 If you are allowing users to use the smbpasswd command to set their own
 passwords, you may want to give users NO PASSWORD initially so they do
@@ -214,7 +215,7 @@ that user with no password. Enable this by adding the line :
 null passwords = true
 
 to the [global] section of the smb.conf file (this is why the
-above scenario is not recommended). Preferebly, allocate your
+above scenario is not recommended). Preferably, allocate your
 users a default password to begin with, so you do not have
 to enable this on your server.
 
@@ -236,16 +237,16 @@ setuid root (the new smbpasswd code enforces this restriction so
 it cannot be run this way by accident).
 
 smbpasswd now works in a client-server mode where it contacts
-the local smbd to change the users password on its behalf. This
+the local smbd to change the user's password on its behalf. This
 has enormous benefits - as follows.
 
-1). smbpasswd no longer has to be setuid root - an enourmous
+1). smbpasswd no longer has to be setuid root - an enormous
 range of potential security problems is eliminated.
 
 2). smbpasswd now has the capability to change passwords
 on Windows NT servers (this only works when the request is
 sent to the NT Primary Domain Controller if you are changing 
-an NT Domain users password).
+an NT Domain user's password).
 
 To run smbpasswd as a normal user just type :
 
@@ -313,7 +314,7 @@ If this fails then you will find that you will need entries that look
 like this:
 
 # SMB password file.
-tridge:148:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:Andrew Tridgell:/home/tridge:/bin/tcsh
+tridge:148:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U          ]:LCT-00000000:Andrew Tridgell:/home/tridge:/bin/tcsh
 
 note that the uid and username fields must be right. Also, you must get
 the number of X's right (there should be 32).

docs/textdocs/Faxing.txt

@@ -1,5 +1,5 @@
 !==
-!== Faxing.txt for Samba release 2.1.0prealpha 981204
+!== Faxing.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:    Gerhard Zuber <zuber@berlin.snafu.de>
 Date:			August 5th 1997.

docs/textdocs/GOTCHAS.txt

@@ -1,5 +1,5 @@
 !==
-!== GOTCHAS.txt for Samba release 2.1.0prealpha 981204
+!== GOTCHAS.txt for Samba release 2.0.4 18 May 1999
 !==
 This file lists Gotchas to watch out for:
 =========================================================================

docs/textdocs/HINTS.txt

@@ -1,5 +1,5 @@
 !==
-!== HINTS.txt for Samba release 2.1.0prealpha 981204
+!== HINTS.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Many
 Updated:	Not for a long time!

docs/textdocs/MIRRORS.txt

@@ -1,5 +1,5 @@
 !==
-!== MIRRORS.txt for Samba release 2.1.0prealpha 981204
+!== MIRRORS.txt for Samba release 2.0.4 18 May 1999
 !==
 
 For a list of web and ftp mirrors please see 

docs/textdocs/Macintosh_Clients.txt

@@ -1,5 +1,5 @@
 !==
-!== Macintosh_Clients.txt for Samba release 2.1.0prealpha 981204
+!== Macintosh_Clients.txt for Samba release 2.0.4 18 May 1999
 !==
 > Are there any Macintosh clients for Samba?
 

docs/textdocs/NTDOMAIN.txt

@@ -1,5 +1,5 @@
 !==
-!== NTDOMAIN.txt for Samba release 2.1.0prealpha 981204
+!== NTDOMAIN.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Luke Kenneth Casson Leighton (samba-bugs@samba.org)
 		Copyright (C) 1997 Luke Kenneth Casson Leighton

docs/textdocs/NetBIOS.txt

@@ -1,5 +1,5 @@
 !==
-!== NetBIOS.txt for Samba release 2.1.0prealpha 981204
+!== NetBIOS.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:    lkcl - samba-bugs@arvidsjaur.anu.edu.au
                 Copyright 1997  Luke Kenneth Casson Leighton 

docs/textdocs/OS2-Client-HOWTO.txt

@@ -1,5 +1,5 @@
 !==
-!== OS2-Client-HOWTO.txt for Samba release 2.1.0prealpha 981204
+!== OS2-Client-HOWTO.txt for Samba release 2.0.4 18 May 1999
 !==
 
 

docs/textdocs/PRINTER_DRIVER.txt

@@ -1,5 +1,5 @@
 !==
-!== PRINTER_DRIVER.txt for Samba release 2.1.0prealpha 981204
+!== PRINTER_DRIVER.txt for Samba release 2.0.4 18 May 1999
 !==
 ==========================================================================
 	Supporting the famous PRINTER$ share

docs/textdocs/PROFILES.txt

@@ -1,5 +1,5 @@
 !==
-!== PROFILES.txt for Samba release 2.1.0prealpha 981204
+!== PROFILES.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributors:	Bruce Cook <BC3-AU@bigfoot.com>
 		Copyright (C) 1998 Bruce Cook

docs/textdocs/Passwords.txt

@@ -1,8 +1,8 @@
 !==
-!== Passwords.txt for Samba release 2.1.0prealpha 981204
+!== Passwords.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Unknown
-Date:		Unknown
+Date:		Updated April 19th 1999.
 Status:		Current
 
 Subject:	NOTE ABOUT PASSWORDS
@@ -37,8 +37,8 @@ Unix password checking method you are using.  Note that the AFS code is
 only written and tested for AFS 3.3 and later.
 
 
-SECURITY = SERVER
+SECURITY = SERVER or DOMAIN
-=================
+===========================
 
 Samba can use a remote server to do its username/password
 validation. This allows you to have one central machine (for example a

docs/textdocs/Printing.txt

@@ -1,5 +1,5 @@
 !==
-!== Printing.txt for Samba release 2.1.0prealpha 981204
+!== Printing.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Unknown <samba-bugs@samba.org>
 Date:		Unknown
@@ -54,7 +54,7 @@ might be:
 
 then you print a file and look at the /tmp/tmp.print file to see what
 is produced. Try printing this file with lpr. Does it work? If not
-then your problem with with your lpr system, not with Samba. Often
+then the problem is with your lpr system, not with Samba. Often
 people have problems with their /etc/printcap file or permissions on
 various print queues. 
 
@@ -95,18 +95,32 @@ If the above debug tips don't help, then maybe you need to bring in
 the bug gun, system tracing. See Tracing.txt in this directory.
 
 =====================================================================
-From Caldera Inc., the following documentation has been contributed:
+From Caldera Inc., the following documentation has been
+contributed. Note that it contains stuff that is only relevant on some
+systems (specifically Caldera OpenLinux systems).
 
 
 8.6 Setting up a raw SAMBA printer.
 
-Note: this is not a guide on setting up SAMBA. It merely addresses creating a printer configuration that will allow the output of regular (i.e. not PostScript) Windows printer drivers to print through SAMBA.
+Note: this is not a guide on setting up SAMBA. It merely addresses
+creating a printer configuration that will allow the output of regular
+(i.e. not PostScript) Windows printer drivers to print through SAMBA.
 
-Regular Windows printer drivers can be used to print via SAMBA, but you must set up a raw printer entry in "/etc/printcap" to accomplish this. Also, a print command will need to be specified in "/etc/smb.conf" that forces binary printing.
+Regular Windows printer drivers can be used to print via SAMBA, but
+you must set up a raw printer entry in "/etc/printcap" to accomplish
+this. Also, a print command will need to be specified in
+"/etc/smb.conf" that forces binary printing.
 
-The best way to start is to use printtool under X to create a new entry specifically for this printer. All you really need for it to do is create the necessary directories and set the permissions correctly, so don't worry about setting up a filter for a specific printer.  Filters are not going to be used at all for this entry.
+The best way to start is to use printtool under X to create a new
+entry specifically for this printer. All you really need for it to do
+is create the necessary directories and set the permissions correctly,
+so don't worry about setting up a filter for a specific printer.
+Filters are not going to be used at all for this entry.
 
-Next, go into "/etc" and edit the printcap entry you just created, changing it to look like this (if you named it something other than raw, the entry name and spool directory should be changed here to match):
+Next, go into "/etc" and edit the printcap entry you just created,
+changing it to look like this (if you named it something other than
+raw, the entry name and spool directory should be changed here to
+match):
 
 raw:\
 	:rw:sh: \
@@ -114,12 +128,15 @@ raw:\
 	:sd=/var/spool/lpd/raw: \
 	:fx=flp:
 
-When this is done and saved, edit the section of the smb.conf file that applies to the printer. Make sure the name of the section (enclosed in brackets) matches the name of the raw printer you just set up, then go down a line or two and add this line:
+When this is done and saved, edit the section of the smb.conf file
+that applies to the printer. Make sure the name of the section
+(enclosed in brackets) matches the name of the raw printer you just
+set up, then go down a line or two and add this line:
  
 print command = lpr -b -P%p %s
 
-Save the file, change to "/etc/rc.d/init.d", and type the following commands
+Save the file, change to "/etc/rc.d/init.d", and type the following
-to restart the necessary daemons:
+commands to restart the necessary daemons:
 
 ./lpd stop
 ./lpd start

docs/textdocs/Recent-FAQs.txt

@@ -1,5 +1,5 @@
 !==
-!== Recent-FAQs.txt for Samba release 2.1.0prealpha 981204
+!== Recent-FAQs.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Samba-bugs@samba.org
 Date:		July 5, 1998

docs/textdocs/RoutedNetworks.txt

@@ -1,5 +1,5 @@
 !==
-!== RoutedNetworks.txt for Samba release 2.1.0prealpha 981204
+!== RoutedNetworks.txt for Samba release 2.0.4 18 May 1999
 !==
 #NOFNR Flag in LMHosts to Communicate Across Routers
 

docs/textdocs/SCO.txt

@@ -1,5 +1,5 @@
 !==
-!== SCO.txt for Samba release 2.1.0prealpha 981204
+!== SCO.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Geza Makay <makayg@math.u-szeged.hu>
 Date:		Unknown

docs/textdocs/SSLeay.txt

@@ -1,5 +1,5 @@
 !==
-!== SSLeay.txt for Samba release 2.1.0prealpha 981204
+!== SSLeay.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor: Christian Starkjohann <cs@obdev.at>
 Date:        May 29, 1998

docs/textdocs/Speed.txt

@@ -1,9 +1,6 @@
 !==
-!== Speed.txt for Samba release 2.1.0prealpha 981204
+!== Speed.txt for Samba release 2.0.4b 20 May 1999
 !==
-Contributor:	Andrew Tridgell
-Date:		January 1995
-Status:		Current
 
 Subject:	Samba performance issues
 ============================================================================
@@ -63,6 +60,21 @@ option has been left in the code for backwards compatibility reasons
 but it's use is now deprecated. A short summary of what the old
 code did follows.
 
+LEVEL2 OPLOCKS
+--------------
+
+With Samba 2.0.5 a new capability - level2 (read only) oplocks is
+supported (although the option is off by default - see the smb.conf
+man page for details). Turning on level2 oplocks (on a share-by-share basis)
+by setting the parameter :
+
+level2 oplocks = true 
+
+should speed concurrent access to files that are not commonly written
+to, such as application serving shares (ie. shares that contain common
+.EXE files - such as a Microsoft Office share) as it allows clients to
+read-ahread cache copies of these files.
+
 Old 'fake oplocks' option - deprecated.
 ---------------------------------------
 

docs/textdocs/Speed2.txt

@@ -1,5 +1,5 @@
 !==
-!== Speed2.txt for Samba release 2.1.0prealpha 981204
+!== Speed2.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Paul Cochrane <paulc@dth.scot.nhs.uk>
 Organization: 	Dundee Limb Fitting Centre

docs/textdocs/Support.txt

@@ -1,5 +1,5 @@
 !==
-!== Support.txt for Samba release 2.1.0prealpha 981204
+!== Support.txt for Samba release 2.0.4 18 May 1999
 !==
 The Samba Consultants List
 ==========================

docs/textdocs/Tracing.txt

@@ -1,5 +1,5 @@
 !==
-!== Tracing.txt for Samba release 2.1.0prealpha 981204
+!== Tracing.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Andrew Tridgell <samba-bugs@samba.org>
 Date:		Old

docs/textdocs/UNIX-SMB.txt

@@ -1,5 +1,5 @@
 !==
-!== UNIX-SMB.txt for Samba release 2.1.0prealpha 981204
+!== UNIX-SMB.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Andrew Tridgell <samba-bugs@samba.org>
 Date:		April 1995

docs/textdocs/UNIX_INSTALL.txt

@@ -1,14 +1,5 @@
-!==
+HOW TO INSTALL AND TEST SAMBA
-!== UNIX_INSTALL.txt for Samba release 2.1.0prealpha 981204
+=============================
-!==
-Contributor:	Andrew Tridgell <samba-bugs@samba.org>
-Date:		Unknown
-Status:		Current
-Updated:	November 13, 1998	<jra@samba.org>
-
-Subject:	HOW TO INSTALL AND TEST SAMBA
-===============================================================================
-
 
 STEP 0. Read the man pages. They contain lots of useful info that will
 help to get you started. If you don't know how to read man pages then

docs/textdocs/UNIX_SECURITY.txt

@@ -1,5 +1,5 @@
 !==
-!== UNIX_SECURITY.txt for Samba release 2.1.0prealpha 981204
+!== UNIX_SECURITY.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	John H Terpstra <jht@samba.org>
 Date:		July 5, 1998

docs/textdocs/Win95.txt

@@ -1,5 +1,5 @@
 !==
-!== Win95.txt for Samba release 2.1.0prealpha 981204
+!== Win95.txt for Samba release 2.0.4 18 May 1999
 !==
 Copyright (C) 1997 - Samba-Team
 Contributed Date:	August 20, 1997

docs/textdocs/WinNT.txt

@@ -1,5 +1,5 @@
 !==
-!== WinNT.txt for Samba release 2.1.0prealpha 981204
+!== WinNT.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributors:	Various
 		Password Section - Copyright (C) 1997 - John H Terpstra

docs/textdocs/cifsntdomain.txt

@@ -1,5 +1,5 @@
 !==
-!== cifsntdomain.txt for Samba release 2.1.0prealpha 981204
+!== cifsntdomain.txt for Samba release 2.0.4 18 May 1999
 !==
 NT Domain Authentication
 ------------------------

docs/textdocs/security_level.txt

@@ -1,5 +1,5 @@
 !==
-!== security_level.txt for Samba release 2.1.0prealpha 981204
+!== security_level.txt for Samba release 2.0.4 18 May 1999
 !==
 Contributor:	Andrew Tridgell
 Updated:	June 27, 1997
@@ -59,16 +59,16 @@ maintain multiple authentication contexts in this way (WinDD is an
 example of an application that does this)
 
 
-Ok, now for share level security. In share level security (the default
+Ok, now for share level security. In share level security the client
-with samba) the client authenticates itself separately for each
+authenticates itself separately for each share. It will send a
-share. It will send a password along with each "tree connection"
+password along with each "tree connection" (share mount). It does not
-(share mount). It does not explicitly send a username with this
+explicitly send a username with this operation. The client is
-operation. The client is expecting a password to be associated with
+expecting a password to be associated with each share, independent of
-each share, independent of the user. This means that samba has to work
+the user. This means that samba has to work out what username the
-out what username the client probably wants to use. It is never
+client probably wants to use. It is never explicitly sent the
-explicitly sent the username. Some commercial SMB servers such as NT actually
+username. Some commercial SMB servers such as NT actually associate
-associate passwords directly with shares in share level security, but
+passwords directly with shares in share level security, but samba
-samba always uses the unix authentication scheme where it is a
+always uses the unix authentication scheme where it is a
 username/password that is authenticated, not a "share/password".
 
 Many clients send a "session setup" even if the server is in share

docs/yodldocs/DOMAIN_MEMBER.yo

@@ -1,6 +1,6 @@
 mailto(samba-bugs@samba.org)
 
-article(Joining an NT Domain with Samba 2.0)(Jeremy Allison, Samba Team)(11th November 1998)
+article(Joining an NT Domain with Samba 2.0)(Jeremy Allison, Samba Team)(7th October 1999)
 
 center(Joining an NT Domain with Samba 2.0)
 center(-----------------------------------)
@@ -8,7 +8,8 @@ center(-----------------------------------)
 In order for a Samba-2 server to join an NT domain, you must first add
 the NetBIOS name of the Samba server to the NT domain on the PDC using
 Server Manager for Domains.  This creates the machine account in the
-domain (PDC) SAM.
+domain (PDC) SAM. Note that you should add the Samba server as a "Windows
+NT Workstation or Server", em(NOT) as a Primary or backup domain controller.
 
 Assume you have a Samba-2 server with a NetBIOS name of tt(SERV1) and are
 joining an NT domain called tt(DOM), which has a PDC with a NetBIOS name
@@ -21,7 +22,7 @@ command
 tt(smbpasswd -j DOM -r DOMPDC)
 
 as we are joining the domain DOM and the PDC for that domain (the only
-machine that has write access to the domain SAM database). If this is
+machine that has write access to the domain SAM database) is DOMPDC. If this is
 successful you will see the message:
 
 tt(smbpasswd: Joined domain DOM.)
@@ -31,8 +32,8 @@ man page for more details.
 
 This command goes through the machine account password change
 protocol, then writes the new (random) machine account password for
-this Samba server into the a file in the same directory in which an
+this Samba server into a file in the same directory in which an
-smbpasswd file would be stored (normally :
+smbpasswd file would be stored - normally :
 
 tt(/usr/local/samba/private)
 
@@ -72,6 +73,10 @@ tt(workgroup = DOM)
 
 as this is the name of the domain we are joining. 
 
+You must also have the parameter url(bf("encrypt passwords"))(smb.conf.5.html#encryptpasswords)
+set to tt("yes") in order for your users to authenticate to the
+NT PDC.
+
 Finally, add (or modify) a:
 
 url(bf("password server ="))(smb.conf.5.html#passwordserver)
@@ -86,19 +91,15 @@ each of these servers in order, so you may want to rearrange this list
 in order to spread out the authentication load among domain
 controllers.
 
-Currently, Samba requires that a defined list of domain controllers be
+Alternatively, if you want smbd to automatically determine the
-listed in this parameter in order to authenticate with domain-level
+list of Domain controllers to use for authentication, you may set this line to be :
-security. NT does not use this method, and will either broadcast or
-use a WINS database in order to find domain controllers to
-authenticate against.
 
-Originally, I considered this idea for Samba, but dropped it because
+tt(password server = *)
-it seemed so insecure.  However several Samba-2 alpha users have
+
-requested that this feature be added to make Samba more NT-like, so
+This method, which is new in Samba 2.0.6 and above, allows Samba
-I'll probably add a special name of tt('*') (which means: act like NT
+to use exactly the same mechanism that NT does. This method either broadcasts or
-when looking for domain controllers) in a future release of the
+uses a WINS database in order to find domain controllers to
-code. At present, however, you need to know where your domain
+authenticate against.
-controllers are.
 
 Finally, restart your Samba daemons and get ready for clients to begin
 using domain security!

docs/yodldocs/nmbd.8.yo

@@ -9,7 +9,7 @@ naming services to clients)
 label(SYNOPSIS)
 manpagesynopsis()
 
-bf(nmbd) [link(-D)(minusD)] [link(-o)(minuso)] [link(-a)(minusa)] [link(-H lmhosts file)(minusH)] [link(-d debuglevel)(minusd)] [link(-l log file basename)(minusl)] [link(-n primary NetBIOS name)(minusn)] [link(-p port number)(minusp)] [link(-s configuration file)(minuss)] [link(-i NetBIOS scope)(minusi)] [link(-h)(minush)]
+bf(nmbd) [link(-D)(minusD)] [link(-a)(minusa)] [link(-o)(minuso)] [link(-h)(minush)] [link(-V)(minusV)] [link(-H lmhosts file)(minusH)] [link(-d debuglevel)(minusd)] [link(-l log file basename)(minusl)] [link(-n primary NetBIOS name)(minusn)] [link(-p port number)(minusp)] [link(-s configuration file)(minuss)] [link(-i NetBIOS scope)(minusi)]
 
 label(DESCRIPTION)
 manpagedescription()
@@ -65,6 +65,12 @@ dit(bf(-o)) If this parameter is specified, the log files will be
 overwritten when opened.  By default, the log files will be appended
 to.
 
+label(minush)
+dit(bf(-h)) Prints the help information (usage) for bf(nmbd).
+
+label(minusV)
+dit(bf(-V)) Prints the version number for bf(nmbd).
+
 label(minusH)
 dit(bf(-H filename)) NetBIOS lmhosts file.
 
@@ -144,9 +150,6 @@ are em(very) rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with.
 
-label(minush)
-dit(bf(-h)) Prints the help information (usage) for bf(nmbd).
-
 endit()
 
 label(FILES)

docs/yodldocs/nmblookup.1.yo

@@ -8,7 +8,7 @@ manpagename(nmblookup)(NetBIOS over TCP/IP client used to lookup NetBIOS names)
 label(SYNOPSIS)
 manpagesynopsis() 
 
-bf(nmblookup) [link(-M)(minusM)] [link(-R)(minusR)] [link(-S)(minusS)] [link(-r)(minusr)] [link(-A)(minusA)] [link(-h)(minush)] [link(-B broadcast address)(minusB)] [link(-U unicast address)(minusU)] [link(-d debuglevel)(minusd)] [link(-s smb config file)(minuss)] [link(-i NetBIOS scope)(minusi)] link(name)(name)
+bf(nmblookup) [link(-M)(minusM)] [link(-R)(minusR)] [link(-S)(minusS)] [link(-r)(minusr)] [link(-A)(minusA)] [link(-h)(minush)] [link(-B broadcast address)(minusB)] [link(-U unicast address)(minusU)] [link(-d debuglevel)(minusd)] [link(-s smb config file)(minuss)] [link(-i NetBIOS scope)(minusi)] [link(-T)(minusT)] link(name)(name)
 
 label(DESCRIPTION)
 manpagedescription()
@@ -26,8 +26,9 @@ manpageoptions()
 startdit()
 
 label(minusM)
-dit(bf(-M)) Searches for a master browser. This is done by doing a
+dit(bf(-M)) Searches for a master browser by looking up the 
-broadcast lookup on the special name tt(__MSBROWSE__).
+NetBIOS name link(bf(name))(name) with a type of 0x1d. If link(bf(name))(name)
+is tt("-") then it does a lookup on the special name tt(__MSBROWSE__).
 
 label(minusR)
 dit(bf(-R)) Set the recursion desired bit in the packet to do a
@@ -61,8 +62,8 @@ dit(bf(-h)) Print a help (usage) message.
 label(minusB)
 dit(bf(-B broadcast address)) Send the query to the given broadcast
 address. Without this option the default behavior of nmblookup is to
-send the query to the broadcast address of the primary network
+send the query to the broadcast address of the network
-interface as either auto-detected or defined in the 
+interfaces as either auto-detected or defined in the 
 url(bf(interfaces))(smb.conf.5.html#interfaces) parameter of the 
 url(bf(smb.conf (5)))(smb.conf.5.html) file.
 
@@ -103,6 +104,12 @@ are em(very) rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with.
 
+label(minusT)
+dit(bf(-T)) This causes any IP addresses found in the lookup to be
+looked up via a reverse DNS lookup into a DNS name, and printed out
+before each tt("IP address   NetBIOS name") pair that is the normal
+output.
+
 label(name)
 dit(bf(name)) This is the NetBIOS name being queried. Depending upon
 the previous options this may be a NetBIOS name or IP address. If a

docs/yodldocs/samba.7.yo

@@ -47,15 +47,6 @@ servers (such as Windows NT), and can also be used to allow a UNIX box
 to print to a printer attached to any SMB server (such as a PC running
 Windows NT).
 
-dit(url(bf(rpcclient))(rpcclient.1.html)) nl() nl() The url(bf(rpcclient)
-(1))(rpcclient.1.html) program is a client that can 'talk' to an
-SMB/CIFS MSRPC server.  Operations include things like managing a SAM
-Database (users, groups and aliases) in the same way as the Windows NT
-programs bf(User Manager for Domains) and bf(Server Manager for Domains);
-managing a remote registry in the same way as the Windows NT programs
-bf(REGEDT32.EXE) and bf(REGEDIT.EXE); viewing a remote event log (same
-as bf(EVENTVWR.EXE)).
-
 dit(url(bf(testparm))(testparm.1.html)) nl() nl() The url(bf(testparm
 (1)))(testparm.1.html) utility allows you to test your url(bf(smb.conf
 (5)))(smb.conf.5.html) configuration file.

docs/yodldocs/smbclient.1.yo

@@ -8,7 +8,7 @@ manpagename(smbclient)(ftp-like client to access SMB/CIFS resources on servers)
 label(SYNOPSIS)
 manpagesynopsis()
 
-bf(smbclient) link(servicename)(servicename) [link(password)(password)] [link(-s smb.conf)(minuss)] [link(-B IP addr)(minusB)] [link(-O socket options)(minusO)][link(-R name resolve order)(minusR)] [link(-M NetBIOS name)(minusM)] [link(-i scope)(minusi)] [link(-N)(minusN)] [link(-n NetBIOS name)(minusn)] [link(-d debuglevel)(minusd)] [link(-P)(minusP)] [link(-p port)(minusp)] [link(-l log basename)(minusl)] [link(-h)(minush)] [link(-I dest IP)(minusI)] [link(-E)(minusE)] [link(-U username)(minusU)] [link(-L NetBIOS name)(minusL)] [link(-t terminal code)(minust)] [link(-m max protocol)(minusm)] [link(-W workgroup)(minusW)] [link(-T<c|x>IXFqgbNan)(minusT)] [link(-D directory)(minusD)] [link(-c command string)(minusc)]
+bf(smbclient) link(servicename)(servicename) [link(-s smb.conf)(minuss)] [link(-O socket options)(minusO)][link(-R name resolve order)(minusR)] [link(-M NetBIOS name)(minusM)] [link(-i scope)(minusi)] [link(-N)(minusN)] [link(-n NetBIOS name)(minusn)] [link(-d debuglevel)(minusd)] [link(-P)(minusP)] [link(-p port)(minusp)] [link(-l log basename)(minusl)] [link(-h)(minush)] [link(-I dest IP)(minusI)] [link(-E)(minusE)] [link(-U username)(minusU)] [link(-L NetBIOS name)(minusL)] [link(-t terminal code)(minust)] [link(-m max protocol)(minusm)] [link(-b buffersize)(minusb)] [link(-W workgroup)(minusW)] [link(-T<c|x>IXFqgbNan)(minusT)] [link(-D directory)(minusD)] [link(-c command string)(minusc)]
 
 label(DESCRIPTION)
 manpagedescription()
@@ -71,9 +71,6 @@ Samba configuration file, smb.conf. This file controls all aspects of
 the Samba setup on the machine and smbclient also needs to read this
 file.
 
-label(minusB)
-dit(bf(-B IP addr)) The IP address to use when sending a broadcast packet.
-
 label(minusO)
 dit(bf(-O socket options)) TCP socket options to set on the client
 socket. See the url(socket options)(smb.conf.5.html#socketoptions)
@@ -107,8 +104,7 @@ it() bf(bcast) : Do a broadcast on each of the known local interfaces
 listed in the url(bf(interfaces))(smb.conf.5.html#interfaces) parameter
 in the smb.conf file. This is the least reliable of the name resolution
 methods as it depends on the target host being on a locally connected
-subnet. To specify a particular broadcast address the link(bf(-B))(minusB) option 
+subnet. 
-may be used.
 
 endit()
 
@@ -286,7 +282,7 @@ nothing before or nothing after the percent symbol will cause an empty
 username or an empty password to be used, respectively.
 
 The password may also be specified by setting up an environment
-variable called tt(PASSWORD) that contains the users password. Note
+variable called tt(PASSWD) that contains the users password. Note
 that this may be very insecure on some systems but on others allows
 users to script smbclient commands without having a password appear in
 the command line of a process listing.
@@ -296,7 +292,7 @@ on an uppercase password. Lowercase or mixed case passwords may be
 rejected by these servers.
 
 Be cautious about including passwords in scripts or in the
-tt(PASSWORD) environment variable. Also, on many systems the command
+tt(PASSWD) environment variable. Also, on many systems the command
 line of a running process may be seen via the tt(ps) command to be
 safe always allow smbclient to prompt for a password and type it in
 directly.
@@ -328,6 +324,12 @@ protocols level the server supports. This parameter is
 preserved for backwards compatibility, but any string
 following the bf(-m) will be ignored.
 
+label(minusb)
+dit(bf(-b buffersize)) This option changes the transmit/send buffer
+size when getting or putting a file from/to the server. The default
+is 65520 bytes. Setting this value smaller (to 1200 bytes) has been
+observed to speed up file transfers to and from a Win9x server.
+
 label(minusW)
 dit(bf(-W WORKGROUP)) Override the default workgroup specified in the
 url(bf(workgroup))(smb.conf.5.html#workgroup) parameter of the
@@ -683,7 +685,7 @@ The variable bf(USER) may contain the username of the person using the
 client.  This information is used only if the protocol level is high
 enough to support session-level passwords.
 
-The variable bf(PASSWORD) may contain the password of the person using
+The variable bf(PASSWD) may contain the password of the person using
 the client.  This information is used only if the protocol level is
 high enough to support session-level passwords.
 

docs/yodldocs/smbd.8.yo

@@ -8,7 +8,7 @@ manpagename(smbd)(server to provide SMB/CIFS services to clients)
 label(SYNOPSIS)
 manpagesynopsis()
 
-bf(smbd) [link(-D)(minusD)] [link(-a)(minusa)] [link(-o)(minuso)] [link(-d debuglevel)(minusd)] [link(-l log file)(minusl)] [link(-p port number)(minusp)] [link(-O socket options)(minusO)] [link(-s configuration file)(minuss)] [link(-i scope)(minusi)] [link(-P)(minusP)] [link(-h)(minush)]
+bf(smbd) [link(-D)(minusD)] [link(-a)(minusa)] [link(-o)(minuso)] [link(-P)(minusP)] [link(-h)(minush)] [link(-V)(minusV)] [link(-d debuglevel)(minusd)] [link(-l log file)(minusl)] [link(-p port number)(minusp)] [link(-O socket options)(minusO)] [link(-s configuration file)(minuss)] [link(-i scope)(minusi)]
 
 label(DESCRIPTION)
 manpagedescription()
@@ -71,6 +71,16 @@ dit(bf(-o)) If this parameter is specified, the log files will be
 overwritten when opened.  By default, the log files will be appended
 to.
 
+label(minusP)
+dit(bf(-P)) Passive option. Causes smbd not to send any network traffic
+out. Used for debugging by the developers only.
+
+label(minush)
+dit(bf(-h)) Prints the help information (usage) for bf(smbd).
+
+label(minusV)
+dit(bf(-V)) Prints the version number for bf(smbd).
+
 label(minusd)
 dit(bf(-d debuglevel)) debuglevel is an integer from 0 to 10.
 
@@ -142,13 +152,6 @@ are em(very) rarely used, only set this parameter if you are the
 system administrator in charge of all the NetBIOS systems you
 communicate with.
 
-label(minush)
-dit(bf(-h)) Prints the help information (usage) for smbd.
-
-label(minusP)
-dit(bf(-P)) Passive option. Causes smbd not to send any network traffic
-out. Used for debugging by the developers only.
-
 endit()
 
 label(FILES)
@@ -421,16 +424,11 @@ performance.
 label(SEEALSO)
 manpageseealso()
 
-bf(hosts_access (5)),
+bf(hosts_access (5)), bf(inetd (8)), url(bf(nmbd (8)))(nmbd.8.html),
-bf(inetd (8)),
+url(bf(smb.conf (5)))(smb.conf.5.html), url(bf(smbclient
-url(bf(nmbd (8)))(nmbd.8.html),
+(1)))(smbclient.1.html), url(bf(testparm (1)))(testparm.1.html),
-url(bf(smb.conf (5)))(smb.conf.5.html),
+url(bf(testprns (1)))(testprns.1.html), and the Internet RFC's
-url(bf(smbclient (1)))(smbclient.1.html),
+bf(rfc1001.txt), bf(rfc1002.txt). In addition the CIFS (formerly SMB)
-url(bf(testparm (1)))(testparm.1.html),
-url(bf(testprns (1)))(testprns.1.html),
-url(bf(rpcclient (1)))(rpcclient.1.html),
-and the Internet RFC's bf(rfc1001.txt), bf(rfc1002.txt).
-In addition the CIFS (formerly SMB)
 specification is available as a link from the Web page :
 url(http://samba.org/cifs/)(http://samba.org/cifs/).
 

docs/yodldocs/swat.8.yo

@@ -3,7 +3,7 @@ mailto(samba-bugs@samba.org)
 manpage(swat htmlcommand((8)))(8)(23 Oct 1998)(Samba)(SAMBA)
 
 label(NAME)
-manpagename(swat)(swat - Samba Web Administration Tool)
+manpagename(swat)(Samba Web Administration Tool)
 
 label(SYNOPSIS)
 manpagesynopsis()

docs/yodldocs/testparm.1.yo

@@ -8,7 +8,7 @@ manpagename(testparm)(check an smb.conf configuration file for internal correctn
 label(SYNOPSIS)
 manpagesynopsis() 
 
-bf(testparm) [link(-s)(minuss)] [link(configfilename)(configfilename)] [link(hostname)(hostname) link(hostIP)(hostIP)]
+bf(testparm) [link(-s)(minuss)] [link(-h)(minush)] [link(-L servername)(minusL)] [link(configfilename)(configfilename)] [link(hostname)(hostname) link(hostIP)(hostIP)]
 
 label(DESCRIPTION)
 manpagedescription()
@@ -28,6 +28,11 @@ If the optional host name and host IP address are specified on the
 command line, this test program will run through the service entries
 reporting whether the specified host has access to each service.
 
+If bf(testparm) finds an error in the url(bf(smb.conf))(smb.conf.5.html)
+file it returns an exit code of 1 to the calling program, else it returns
+an exit code of 0. This allows shell scripts to test the output from
+bf(testparm).
+
 label(OPTIONS)
 manpageoptions()
 
@@ -38,6 +43,13 @@ dit(bf(-s)) Without this option, bf(testparm) will prompt for a
 carriage return after printing the service names and before dumping
 the service definitions.
 
+label(minush)
+dit(bf(-h)) Print usage message
+
+label(minusL)
+dit(bf(-L servername)) Sets the value of the %L macro to servername. This
+is useful for testing include files specified with the %L macro.
+
 label(configfilename)
 dit(bf(configfilename)) This is the name of the configuration file to
 check. If this parameter is not present then the default

examples/autofs/auto.a

@@ -9,10 +9,7 @@ valepp		-fstype=nfs,rsize=8192,wsize=8192		valepp:/
 galaun		-fstype=nfs,rsize=8192,wsize=8192		galaun:/
 
 # smb-servers
-supra_andreas	-fstype=smb,uuname=andreas			supra:/aheinrich
+supra_andreas	-fstype=smb,username=andreas,password=foo	://supra/aheinrich
-supra_cspiel	-fstype=smb,uuname=cspiel			supra:/cspiel
+supra_cspiel	-fstype=smb,username=cspiel			://supra/cspiel
-phonon_andreas	-fstype=smb,uuname=andreas,fmod=3700		phonon:/andreas
+phonon_andreas	-fstype=smb,username=andreas			://phonon/andreas
-helium_cspiel	-fstype=smb,uuname=cspiel,fmod=3700		helium:/cspiel
+helium_cspiel	-fstype=smb,username=cspiel			://helium/cspiel
-
-#supra_jaz       -fstype=smb,user,fmod=644,dmod=755		supra:/f
-

examples/printer-accounting/hp5-redir

@@ -1,8 +1,5 @@
 #!/usr/bin/perl
 #
-# $Source: /data/src/mirror/cvs/samba/examples/printer-accounting/hp5-redir,v $
-# $Id: hp5-redir,v 1.1 1996/07/23 03:30:56 samba-bugs Exp $
-#
 # 0 == stdin  == docuement
 # 1 == stdout == printer
 # 2 == stderr == logging

examples/printer-accounting/lp-acct

@@ -1,8 +1,5 @@
 #!/usr/bin/perl
 #
-# $Source: /data/src/mirror/cvs/samba/examples/printer-accounting/lp-acct,v $
-# $Id: lp-acct,v 1.1 1996/07/23 03:30:56 samba-bugs Exp $
-#
 # 0 == stdin  == docuement
 # 1 == stdout == printer
 # 2 == stderr == logging

examples/printing/smbprint

@@ -87,7 +87,7 @@ echo "server $server, service $service" >> $logfile
 (
 # NOTE You may wish to add the line `echo translate' if you want automatic
 # CR/LF translation when printing.
-	if [ $TRANS ]; then
+	if [ $TRANS -eq 1 ]; then
           echo translate
         fi
 	echo "print -"

packaging/Digital/package-prep

@@ -1,8 +1,8 @@
 tar xvf skeleton.tar
+NOWDIR=`pwd`;
 ( cd /usr/local;
-	mv man man.orig;
+	if [ -x man ]; then mv man man.orig; fi
-	mv samba samba.orig;
+	if [ -x samba ]; then mv samba samba.orig; fi
-	DIRNOW=`pwd1`;
 	ln -sf $NOWDIR/usr/local/man man;
 	ln -sf $NOWDIR/usr/local/samba samba; )
 gunzip samba-2.0.0.tar.gz
@@ -24,7 +24,7 @@ tar cvf samba-2.0.0.tar samba-2.0.0
 rm -rf samba-2.0.0
 rm -rf usr var
 cd ..
-find samba-2.0.0 -print | cpio -o > samba-2.0.0-OSF1-v4.0-alpha.cpio
+find samba-2.0.0 -print | cpio -o > samba-2.0.0-OSF1-v4.0-beta5.cpio
-gzip samba-2.0.0-OSF1-v4.0-alpha.cpio
+gzip samba-2.0.0-OSF1-v4.0-beta5.cpio
 cd samba-2.0.0
-tar xcf install.tar
+tar xvf install.tar

packaging/Digital/samba.init

@@ -19,8 +19,8 @@ case "$1" in
 
 	'start')
 	   echo "Starting Samba"
-	   /usr/local/samba/sbin/smbd
+	   /usr/local/samba/bin/smbd
-	   /usr/local/samba/sbin/nmbd
+	   /usr/local/samba/bin/nmbd
 	   echo "Done."
 	   ;;
 	'stop')

packaging/Example/package-prep

@@ -7,7 +7,7 @@ tar xvf skeleton.tar
 ( cd /usr/local;
 	mv man man.orig;
 	mv samba samba.orig;
-	DIRNOW=`pwd1`;
+	NOWDIR=`pwd`;
 		ln -sf $NOWDIR/usr/local/man man;
 		ln -sf $NOWDIR/usr/local/samba samba; )
 
@@ -32,9 +32,8 @@ tar cvf install.tar usr var
 
 # Clean up original sources preserving all configured files
 #        Note: This will allow installers to check build options
-cd samba-X.X.X/source/bin
+cd samba-X.X.X/source
-rm -f *
+rm -f ../source/bin/*
-cd ..
 make clean
 cd ../..
 tar cvf samba-X.X.X.tar samba-X.X.X

packaging/PHT/TurboLinux/makefile-path.patch

@@ -1,44 +1,12 @@
-diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
---- samba-PVERSION/source/Makefile.in	Wed Dec  2 14:35:18 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
-+++ samba-kgc/source/Makefile.in	Wed Dec  2 15:06:02 1998
+@@ -25,9 +25,9 @@
-@@ -27,7 +27,7 @@
+ BINDIR = @bindir@
+ # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
- SBINDIR = @bindir@
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
+-VARDIR = @localstatedir@
-+VARDIR = /var
++VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -36,23 +36,23 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
-+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
--SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
--SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
-+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
-+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
-+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
-+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
- SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
- 
- # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
-+SWATDIR = $(BASEDIR)/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages

packaging/PHT/TurboLinux/smb.conf

@@ -85,7 +85,7 @@
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
+   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them

packaging/RedHat/makefile-path.patch

@@ -1,44 +1,12 @@
-diff -uNr samba-PVERSION/source/Makefile.in samba-kgc/source/Makefile.in
+--- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
---- samba-PVERSION/source/Makefile.in	Wed Dec  2 14:35:18 1998
++++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
-+++ samba-kgc/source/Makefile.in	Wed Dec  2 15:06:02 1998
+@@ -25,9 +25,9 @@
-@@ -27,7 +27,7 @@
+ BINDIR = @bindir@
+ # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
- SBINDIR = @bindir@
+-SBINDIR = @bindir@
++SBINDIR = @sbindir@
  LIBDIR = @libdir@
--VARDIR = $(BASEDIR)/var
+-VARDIR = @localstatedir@
-+VARDIR = /var
++VARDIR = /var/log/samba
  MANDIR = @mandir@
- 
- # The permissions to give the executables
-@@ -36,23 +36,23 @@
- # set these to where to find various files
- # These can be overridden by command line switches (see smbd(8))
- # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+SMBLOGFILE = $(VARDIR)/log/samba/log.smb
-+NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
- CONFIGFILE = $(LIBDIR)/smb.conf
- LMHOSTSFILE = $(LIBDIR)/lmhosts
- DRIVERFILE = $(LIBDIR)/printers.def
- PASSWD_PROGRAM = /bin/passwd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
--SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
--SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
-+SMB_PASSWD_FILE = $(LIBDIR)/smbpasswd
-+SMB_PASSGRP_FILE = $(LIBDIR)/smbpassgrp
-+SMB_GROUP_FILE = $(LIBDIR)/smbgroup
-+SMB_ALIAS_FILE = $(LIBDIR)/smbalias
- SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
- 
- # This is where SWAT images and help files go
--SWATDIR = $(BASEDIR)/swat
-+SWATDIR = $(BASEDIR)/share/swat
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = $(VARDIR)/lock/samba
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages

packaging/RedHat/makerpms.sh.tmpl

@@ -1,14 +1,47 @@
 #!/bin/sh
 # Copyright (C) John H Terpstra 1998
+# Updated for RPM 3 by Jochen Wiedmann, joe@ispsoft.de
 #
+USERID=`id -u`
+GRPID=`id -g`
+
+rpm3var () {
+    echo "rpm3var start $1" >>/tmp/log
+    var=`rpm --showrc \
+         | awk "/-[0-9]+[:=][[:blank:]]+$1[[:blank:]]/ {print \\$3}"`
+    echo "var=$var" >>/tmp/log
+    while test -n "`echo $var | egrep '%{[_a-zA-Z]+}'`"; do
+       v=`echo $var | sed 's/.*%{\([_a-zA-Z]\+\)}.*/\1/'`
+       echo "Loop: v=$v" >>/tmp/log
+       w="`rpm3var $v`"
+       var=`echo $var | sed "s,%{\\([_a-zA-Z]\\+\\)},$w,g"`
+       echo "Loop: var=$var" >>/tmp/log
+    done
+    echo "rpm3var stop $1 $var" >>/tmp/log
+    echo $var
+}
+
+case `rpm --version | awk '{print $3}'` in
+    2.*)
        RPMDIR=`rpm --showrc | awk '/^rpmdir/ { print $3}'`
        SPECDIR=`rpm --showrc | awk '/^specdir/ { print $3}'`
        SRCDIR=`rpm --showrc | awk '/^sourcedir/ { print $3}'`
+       ;;
+    3.*)
+       RPMDIR=`rpm3var _rpmdir`
+       SPECDIR=`rpm3var _specdir`
+       SRCDIR=`rpm3var _sourcedir`
+       ;;
+    *)
+       echo "Unknown RPM version: `rpm --version`"
+       exit 1
+       ;;
+esac
 
+( cd ../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-PVERSION )
 ( cd ../../.. ; tar czvf ${SRCDIR}/samba-PVERSION.tar.gz samba-PVERSION )
+
 cp -a *.spec $SPECDIR
 cp -a *.patch smb.* samba.log $SRCDIR
-cd $SRCDIR
-chown -R root.root samba-PVERSION
 cd $SPECDIR
 rpm -ba -v samba2.spec

packaging/RedHat/samba.log

@@ -1,11 +1,11 @@
 /var/log/samba/log.nmb {
     postrotate
 	/usr/bin/killall -HUP nmbd
-    endrotate
+    endscript
 }
 
 /var/log/samba/log.smb {
     postrotate
 	/usr/bin/killall -HUP smbd
-    endrotate
+    endscript
 }

packaging/RedHat/samba2.spec.tmpl

@@ -11,6 +11,7 @@ Packager: John H Terpstra [Samba-Team] <jht@samba.org>
 Requires: pam >= 0.64
 Prereq: chkconfig fileutils
 BuildRoot: /var/tmp/samba
+Prefix: /usr
 
 %description
 Samba provides an SMB server which can be used to provide
@@ -38,6 +39,25 @@ for Shadow passwords. Do NOT recompile with the SHADOW_PWD option
 enabled. Red Hat Linux has built in support for quotas in PAM.
 
 %changelog
+* Sat Nov 29 1999 Matthew Vanecek <mev0003@unt.edu>
+ - Added a Prefix and changed "/usr" to "%{prefix}"
+
+* Sat Nov 11 1999 Tridge <tridge@linuxcare.com>
+ - changed from mount.smb to mount.smbfs
+
+* Sat Oct 9 1999 Tridge <tridge@linuxcare.com>
+ - removed smbwrapper
+ - added smbmnt and smbmount
+
+* Sun Apr 25 1999 John H Terpstra <jht@samba.org>
+ - added smbsh.1 man page
+
+* Fri Mar 26 1999 Andrew Tridgell <tridge@samba.org>
+ - added --with-pam as pam is no longer used by default
+
+* Sat Jan 27 1999 Jeremy Allison <jra@samba.org>
+ - Removed smbrun binary and tidied up some loose ends
+
 * Sun Oct 25 1998 John H Terpstra <jht@samba.org>
  - Added parameters to /config to ensure smb.conf, lmhosts, 
 	and smbusers never gets over-written.
@@ -75,7 +95,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
  - Updated spec file
  - Included new codepage.936
 
-* Sat Mar 20 1998 John H Terpstra <jht@samba.anu.edu/au>
+* Sat Mar 20 1998 John H Terpstra <jht@samba.org>
  - Added swat facility
 
 * Sat Jan 24 1998 John H Terpstra <jht@samba.org>
@@ -97,8 +117,8 @@ enabled. Red Hat Linux has built in support for quotas in PAM.
 
 %build
 cd source
-./configure --prefix=/usr --libdir=/etc --with-smbwrapper
+./configure --prefix=%{prefix} --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=%{prefix}/share/swat --with-smbmount --with-automount --with-quotas --with-pam
-make all smbwrapper
+make all
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,34 +127,38 @@ mkdir -p $RPM_BUILD_ROOT/etc/codepages/src
 mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d}
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/{init.d,rc0.d,rc1.d,rc2.d,rc3.d,rc5.d,rc6.d}
 mkdir -p $RPM_BUILD_ROOT/home/samba
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/{bin,sbin}
-mkdir -p $RPM_BUILD_ROOT/usr/share/swat/{images,help,include}
+mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/usr/man/{man1,man5,man7,man8}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/share/swat/{images,help,include}
+mkdir -p $RPM_BUILD_ROOT%{prefix}/man/{man1,man5,man7,man8}
 mkdir -p $RPM_BUILD_ROOT/var/lock/samba
 mkdir -p $RPM_BUILD_ROOT/var/log/samba
 mkdir -p $RPM_BUILD_ROOT/var/spool/samba
 
 # Install standard binary files
-for i in nmblookup smbclient smbpasswd smbrun smbstatus testparm testprns \
+for i in nmblookup smbclient smbspool smbpasswd smbstatus testparm testprns \
-      make_smbcodepage make_printerdef rpcclient smbsh smbwrapper.so
+      make_smbcodepage make_printerdef rpcclient
 do
-install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/bin
+install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 for i in addtosmbpass mksmbpasswd.sh smbtar 
 do
-install -m755 source/script/$i $RPM_BUILD_ROOT/usr/bin
+install -m755 source/script/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
 
 # Install secure binary files
-for i in smbd nmbd swat
+for i in smbd nmbd swat smbmount smbmnt smbumount
 do
-install -m755 -s source/bin/$i $RPM_BUILD_ROOT/usr/sbin
+install -m755 -s source/bin/$i $RPM_BUILD_ROOT%{prefix}/sbin
 done
 
+# we need a symlink for mount to recognise the smb filesystem type
+ln -sf %{prefix}/sbin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
+
 # Install level 1 man pages
 for i in smbclient.1 smbrun.1 smbstatus.1 smbtar.1 testparm.1 testprns.1 make_smbcodepage.1 nmblookup.1
 do
-install -m644 docs/manpages/$i $RPM_BUILD_ROOT/usr/man/man1
+install -m644 docs/manpages/$i $RPM_BUILD_ROOT%{prefix}/man/man1
 done
 
 # Install codepage source files
@@ -146,34 +170,37 @@ done
 # Install SWAT helper files
 for i in swat/help/*.html docs/htmldocs/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/help
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help
 done
 for i in swat/images/*.gif
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/images
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images
 done
 for i in swat/include/*.html
 do
-install -m644 $i $RPM_BUILD_ROOT/usr/share/swat/include
+install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
 done
 
 # Install the miscellany
-install -m644 swat/README $RPM_BUILD_ROOT/usr/share/swat
+install -m644 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat
-install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT/usr/man/man5
+install -m644 docs/manpages/smb.conf.5 $RPM_BUILD_ROOT%{prefix}/man/man5
-install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT/usr/man/man5
+install -m644 docs/manpages/lmhosts.5 $RPM_BUILD_ROOT%{prefix}/man/man5
-install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT/usr/man/man5
+install -m644 docs/manpages/smbpasswd.5 $RPM_BUILD_ROOT%{prefix}/man/man5
-install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT/usr/man/man7
+install -m644 docs/manpages/samba.7 $RPM_BUILD_ROOT%{prefix}/man/man7
-install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT/usr/man/man8
+install -m644 docs/manpages/smbd.8 $RPM_BUILD_ROOT%{prefix}/man/man8
-install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT/usr/man/man8
+install -m644 docs/manpages/nmbd.8 $RPM_BUILD_ROOT%{prefix}/man/man8
-install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT/usr/man/man8
+install -m644 docs/manpages/swat.8 $RPM_BUILD_ROOT%{prefix}/man/man8
-install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT/usr/man/man8
+install -m644 docs/manpages/smbmnt.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbmount.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbpasswd.8 $RPM_BUILD_ROOT%{prefix}/man/man8
+install -m644 docs/manpages/smbspool.8 $RPM_BUILD_ROOT%{prefix}/man/man8
 install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/smb.conf
 install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/smbusers
-install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT/usr/bin
+install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
-install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT/usr/bin
+install -m755 packaging/RedHat/findsmb $RPM_BUILD_ROOT%{prefix}/bin
-install -m755 packaging/RedHat/smbadduser $RPM_BUILD_ROOT/usr/bin
+install -m755 packaging/RedHat/smbadduser $RPM_BUILD_ROOT%{prefix}/bin
 install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
-install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT/usr/sbin/samba
+install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
 install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/lmhosts
@@ -187,7 +214,7 @@ rm -rf $RPM_BUILD_ROOT
 # Build codepage load files
 for i in 437 737 850 852 861 866 932 936 949 950
 do
-/usr/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
+%{prefix}/bin/make_smbcodepage c $i /etc/codepages/src/codepage_def.$i /etc/codepages/codepage.$i
 done
 
 # Add swat entry to /etc/services if not already there
@@ -197,7 +224,7 @@ fi
 
 # Add swat entry to /etc/inetd.conf if needed
 if !( grep ^[:space:]*swat /etc/inetd.conf > /dev/null ) then
-	echo 'swat	stream	tcp	nowait.400	root	/usr/sbin/swat swat' >> /etc/inetd.conf
+	echo 'swat	stream	tcp	nowait.400	root	%{prefix}/sbin/swat swat' >> /etc/inetd.conf
 killall -1 inetd || :
 fi
 
@@ -221,9 +248,7 @@ fi
 
 %postun
 # Only delete remnants of samba if this is the final deletion.
-if [ $1 != 0 ] ; then
+if [ $1 = 0 ] ; then
-    exit 0
-
     if [ -x /etc/pam.d/samba ]; then
       rm -f /etc/pam.d/samba
     fi
@@ -255,56 +280,60 @@ fi
 %doc docs
 %doc swat/README
 %doc examples
-%attr(-,root,root) /usr/sbin/smbd
+%attr(-,root,root) %{prefix}/sbin/smbd
-%attr(-,root,root) /usr/sbin/nmbd
+%attr(-,root,root) %{prefix}/sbin/nmbd
-%attr(-,root,root) /usr/sbin/swat
+%attr(-,root,root) %{prefix}/sbin/swat
-%attr(0750,root,root) /usr/sbin/samba
+%attr(-,root,root) %{prefix}/sbin/smbmnt
-%attr(-,root,root) /usr/bin/addtosmbpass
+%attr(-,root,root) %{prefix}/sbin/smbmount
-%attr(-,root,root) /usr/bin/mksmbpasswd.sh
+%attr(-,root,root) %{prefix}/sbin/smbumount
-%attr(-,root,root) /usr/bin/smbclient
+%attr(-,root,root) /sbin/mount.smbfs
-%attr(-,root,root) /usr/bin/rpcclient
+%attr(0750,root,root) %{prefix}/sbin/samba
-%attr(-,root,root) /usr/bin/testparm
+%attr(-,root,root) %{prefix}/bin/addtosmbpass
-%attr(-,root,root) /usr/bin/testprns
+%attr(-,root,root) %{prefix}/bin/mksmbpasswd.sh
-%attr(-,root,root) /usr/bin/smbrun
+%attr(-,root,root) %{prefix}/bin/smbclient
-%attr(-,root,root) /usr/bin/findsmb
+%attr(-,root,root) %{prefix}/bin/smbspool
-%attr(-,root,root) /usr/bin/smbstatus
+%attr(-,root,root) %{prefix}/bin/rpcclient
-%attr(-,root,root) /usr/bin/nmblookup
+%attr(-,root,root) %{prefix}/bin/testparm
-%attr(-,root,root) /usr/bin/make_smbcodepage
+%attr(-,root,root) %{prefix}/bin/testprns
-%attr(-,root,root) /usr/bin/make_printerdef
+%attr(-,root,root) %{prefix}/bin/findsmb
-%attr(-,root,root) /usr/bin/smbpasswd
+%attr(-,root,root) %{prefix}/bin/smbstatus
-%attr(-,root,root) /usr/bin/smbtar
+%attr(-,root,root) %{prefix}/bin/nmblookup
-%attr(-,root,root) /usr/bin/smbprint
+%attr(-,root,root) %{prefix}/bin/make_smbcodepage
-%attr(-,root,root) /usr/bin/smbadduser
+%attr(-,root,root) %{prefix}/bin/make_printerdef
-%attr(0755,root,root) /usr/bin/smbsh
+%attr(-,root,root) %{prefix}/bin/smbpasswd
-%attr(0755,root,root) /usr/bin/smbwrapper.so
+%attr(-,root,root) %{prefix}/bin/smbtar
-%attr(-,root,root) /usr/share/swat/help/welcome.html
+%attr(-,root,root) %{prefix}/bin/smbprint
-%attr(-,root,root) /usr/share/swat/help/DOMAIN_MEMBER.html
+%attr(-,root,root) %{prefix}/bin/smbadduser
-%attr(-,root,root) /usr/share/swat/help/lmhosts.5.html
+%attr(-,root,root) %{prefix}/share/swat/help/welcome.html
-%attr(-,root,root) /usr/share/swat/help/make_smbcodepage.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/DOMAIN_MEMBER.html
-%attr(-,root,root) /usr/share/swat/help/nmbd.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/NT_Security.html
-%attr(-,root,root) /usr/share/swat/help/nmblookup.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/lmhosts.5.html
-%attr(-,root,root) /usr/share/swat/help/samba.7.html
+%attr(-,root,root) %{prefix}/share/swat/help/make_smbcodepage.1.html
-%attr(-,root,root) /usr/share/swat/help/smb.conf.5.html
+%attr(-,root,root) %{prefix}/share/swat/help/nmbd.8.html
-%attr(-,root,root) /usr/share/swat/help/smbclient.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/nmblookup.1.html
-%attr(-,root,root) /usr/share/swat/help/smbd.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/samba.7.html
-%attr(-,root,root) /usr/share/swat/help/smbpasswd.5.html
+%attr(-,root,root) %{prefix}/share/swat/help/smb.conf.5.html
-%attr(-,root,root) /usr/share/swat/help/smbpasswd.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbclient.1.html
-%attr(-,root,root) /usr/share/swat/help/smbrun.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbspool.8.html
-%attr(-,root,root) /usr/share/swat/help/smbstatus.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbd.8.html
-%attr(-,root,root) /usr/share/swat/help/smbtar.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbpasswd.5.html
-%attr(-,root,root) /usr/share/swat/help/swat.8.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbpasswd.8.html
-%attr(-,root,root) /usr/share/swat/help/testparm.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbrun.1.html
-%attr(-,root,root) /usr/share/swat/help/testprns.1.html
+%attr(-,root,root) %{prefix}/share/swat/help/smbstatus.1.html
-%attr(-,root,root) /usr/share/swat/images/globals.gif
+%attr(-,root,root) %{prefix}/share/swat/help/smbtar.1.html
-%attr(-,root,root) /usr/share/swat/images/home.gif
+%attr(-,root,root) %{prefix}/share/swat/help/swat.8.html
-%attr(-,root,root) /usr/share/swat/images/passwd.gif
+%attr(-,root,root) %{prefix}/share/swat/help/testparm.1.html
-%attr(-,root,root) /usr/share/swat/images/printers.gif
+%attr(-,root,root) %{prefix}/share/swat/help/testprns.1.html
-%attr(-,root,root) /usr/share/swat/images/shares.gif
+%attr(-,root,root) %{prefix}/share/swat/images/globals.gif
-%attr(-,root,root) /usr/share/swat/images/samba.gif
+%attr(-,root,root) %{prefix}/share/swat/images/home.gif
-%attr(-,root,root) /usr/share/swat/images/status.gif
+%attr(-,root,root) %{prefix}/share/swat/images/passwd.gif
-%attr(-,root,root) /usr/share/swat/images/viewconfig.gif
+%attr(-,root,root) %{prefix}/share/swat/images/printers.gif
-%attr(-,root,root) /usr/share/swat/include/header.html
+%attr(-,root,root) %{prefix}/share/swat/images/shares.gif
-%attr(-,root,root) /usr/share/swat/include/footer.html
+%attr(-,root,root) %{prefix}/share/swat/images/samba.gif
+%attr(-,root,root) %{prefix}/share/swat/images/status.gif
+%attr(-,root,root) %{prefix}/share/swat/images/viewconfig.gif
+%attr(-,root,root) %{prefix}/share/swat/include/header.html
+%attr(-,root,root) %{prefix}/share/swat/include/footer.html
 %attr(-,root,root) %config(noreplace) /etc/lmhosts
 %attr(-,root,root) %config(noreplace) /etc/smb.conf
 %attr(-,root,root) %config(noreplace) /etc/smbusers
@@ -321,22 +350,25 @@ fi
 %attr(-,root,root) /etc/codepages/src/codepage_def.936
 %attr(-,root,root) /etc/codepages/src/codepage_def.949
 %attr(-,root,root) /etc/codepages/src/codepage_def.950
-%attr(-,root,root) /usr/man/man1/smbstatus.1
+%attr(-,root,root) %{prefix}/man/man1/smbstatus.1
-%attr(-,root,root) /usr/man/man1/smbclient.1
+%attr(-,root,root) %{prefix}/man/man1/smbclient.1
-%attr(-,root,root) /usr/man/man1/make_smbcodepage.1
+%attr(-,root,root) %{prefix}/man/man1/make_smbcodepage.1
-%attr(-,root,root) /usr/man/man1/smbrun.1
+%attr(-,root,root) %{prefix}/man/man1/smbrun.1
-%attr(-,root,root) /usr/man/man1/smbtar.1
+%attr(-,root,root) %{prefix}/man/man1/smbtar.1
-%attr(-,root,root) /usr/man/man1/testparm.1
+%attr(-,root,root) %{prefix}/man/man1/testparm.1
-%attr(-,root,root) /usr/man/man1/testprns.1
+%attr(-,root,root) %{prefix}/man/man1/testprns.1
-%attr(-,root,root) /usr/man/man1/nmblookup.1
+%attr(-,root,root) %{prefix}/man/man1/nmblookup.1
-%attr(-,root,root) /usr/man/man5/smb.conf.5
+%attr(-,root,root) %{prefix}/man/man5/smb.conf.5
-%attr(-,root,root) /usr/man/man5/lmhosts.5
+%attr(-,root,root) %{prefix}/man/man5/lmhosts.5
-%attr(-,root,root) /usr/man/man5/smbpasswd.5
+%attr(-,root,root) %{prefix}/man/man5/smbpasswd.5
-%attr(-,root,root) /usr/man/man7/samba.7
+%attr(-,root,root) %{prefix}/man/man7/samba.7
-%attr(-,root,root) /usr/man/man8/smbd.8
+%attr(-,root,root) %{prefix}/man/man8/smbd.8
-%attr(-,root,root) /usr/man/man8/nmbd.8
+%attr(-,root,root) %{prefix}/man/man8/nmbd.8
-%attr(-,root,root) /usr/man/man8/smbpasswd.8
+%attr(-,root,root) %{prefix}/man/man8/smbpasswd.8
-%attr(-,root,root) /usr/man/man8/swat.8
+%attr(-,root,root) %{prefix}/man/man8/swat.8
+%attr(-,root,root) %{prefix}/man/man8/smbmnt.8
+%attr(-,root,root) %{prefix}/man/man8/smbmount.8
+%attr(-,root,root) %{prefix}/man/man8/smbspool.8
 %attr(-,root,nobody) %dir /home/samba
 %attr(-,root,root) %dir /etc/codepages
 %attr(-,root,root) %dir /etc/codepages/src

packaging/RedHat/smb.conf

@@ -85,7 +85,7 @@
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
-   socket options = TCP_NODELAY 
+   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
 
 # Configure Samba to use multiple interfaces
 # If you have multiple network interfaces then you must list them

packaging/SGI/idb.pl

@@ -8,6 +8,15 @@ $curdir = $ENV{"PWD"};
 
 # We don't want the files listed in .cvsignore in the source tree
 open(IGNORES,"../../source/.cvsignore") || die "Unable to open .cvsignore file\n";
+while (<IGNORES>) {
+  chop;
+  next if /cvs\.log/;
+  $ignores{$_}++;
+}
+close IGNORES;
+
+# We don't want the files listed in .cvsignore in the source/include tree
+open(IGNORES,"../../source/include/.cvsignore") || die "Unable to open include/.cvsignore file\n";
 while (<IGNORES>) {
   chop;
   $ignores{$_}++;
@@ -32,6 +41,7 @@ if (@sprogs) {
 }
 if (@progs) {
   @progs[0] =~ s/^.*\=//;
+  @progs[0] =~ s/\$\(\S+\)\s//g;
   @progs = split(' ',@progs[0]);
 }
 if (@mprogs) {
@@ -48,6 +58,7 @@ if (@progs2) {
 }
 if (@scripts) {
   @scripts[0] =~ s/^.*\=//;
+  @scripts[0] =~ s/\$\(srcdir\)\///g;
   @scripts = split(' ',@scripts[0]);
 }
 if (@codepage) {
@@ -177,7 +188,7 @@ while (@sorted) {
     print IDB "d 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
   }
   else {
-    if (grep((/\.sh$/ | /\.pl$/ | /mkman$/),$nextfile)) {
+    if (grep((/\.sh$/ | /configure$/ | /configure\.developer/ | /config\.guess/ | /config\.sub/ | /\.pl$/ | /mkman$/),$nextfile)) {
 	print IDB "f 0755 root sys usr/samba/src/$nextfile $nextfile samba.src.samba\n";
     }
     else {
@@ -210,7 +221,7 @@ while (@catman) {
   $nextfile = shift @catman;
   ($file = $nextfile) =~ s/^packaging\/SGI\/catman\///;
   ($dirnum = $file) =~ s/^[\D]*//;
-  $dirnum =~ s/\.Z//;
+  $dirnum =~ s/\.z//;
   if ($dirnum ne $olddirnum) {
     print IDB "d 0755 root sys usr/share/catman/u_man/cat$dirnum packaging/SGI samba.man.manpages\n";
     $olddirnum = $dirnum;

packaging/SGI/inst.msg

@@ -2,7 +2,7 @@
 
 echo
 echo
-echo Samba for IRIX has been installed on your system.
+echo Samba has been installed on your system.
 echo 
 echo Your /etc/services and /etc/inetd.conf files have
 echo been modified to automatically start the

packaging/SGI/mkman

@@ -9,7 +9,10 @@ FILES="*.?"
 
 cd ../../docs/manpages
 for FILE in  $FILES ; do
+   if [ "$FILE" = "smbmnt.8" ]; then continue; fi;
+   if [ "$FILE" = "smbmount.8" -o "$FILE" = "smbumount.8" ]; then continue; fi;
+   if [ "$FILE" = "smbrun.1" ]; then continue; fi;
    neqn $FILE | tbl | nroff -man > ../../packaging/SGI/catman/`basename $FILE`
-   compress -f ../../packaging/SGI/catman/`basename $FILE`
+   pack -f ../../packaging/SGI/catman/`basename $FILE`
 done
 cd ../../packaging/SGI

packaging/SGI/mkrelease.sh

@@ -14,6 +14,7 @@
 
 doclean=""
 SGI_ABI=-n32
+ISA=-mips3
 CC=cc
 
 if [ ! -f ../../source/Makefile ]; then
@@ -25,6 +26,7 @@ if [ "$1" = "clean" ]; then
   shift
 elif [ "$1" = "5" ]; then
   SGI_ABI=-32
+  ISA=""
   shift
 fi
 
@@ -35,10 +37,11 @@ if [ "$1" = "clean" ]; then
   shift
 elif [ "$1" = "5" ]; then
   SGI_ABI=-32
+  ISA=""
   shift
 fi
 
-export SGI_ABI CC
+export SGI_ABI ISA CC
 
 if [ "$doclean" = "clean" ]; then
   cd ../../source
@@ -64,11 +67,6 @@ fi
 cd ../../source
 if [ "$doclean" = "clean" ]; then
   echo Create SGI specific Makefile
-  chmod +x configure
-  chmod +x configure.developer
-  chmod +x config.guess
-  chmod +x config.status
-  chmod +x config.sub
   ./configure --prefix=/usr/samba --mandir=/usr/share/catman --with-smbwrapper
   errstat=$?
   if [ $errstat -ne 0 ]; then

packaging/SGI/sambalp

@@ -146,5 +146,12 @@ if ($PSFIX) {			# are we running a "psfix"?
     system("$lpcommand $file");
 }
 
-# Remove the file only if it lives in /usr/tmp, /tmp, or /var/tmp.
+if ($file =~ m(^/)) {
-unlink($file) if $file =~ m=^(/(usr|var))?/tmp=;
+	# $file is a fully specified path
+	# Remove the file only if it lives in a directory ending in /tmp.
+	unlink($file) if ($file =~ m(/tmp/[^/]+$));
+} else {
+	# $file is NOT a fully specified path
+	# Remove the file only if current directory ends in /tmp.
+	unlink($file) if (`pwd` =~ m(/tmp$));
+}

packaging/SGI/smb.conf

@@ -76,6 +76,16 @@
    preserve case = yes
    short preserve case = yes
 
+;  These are the settings required for IRIX password sync
+   passwd program = /usr/bin/passwd %u
+   passwd chat = *ew*password:* %n\n *e-enter*new*password:* %n\n
+
+;  Uncomment the following if you wish to use encrypted passwords.
+;   encrypt passwords = yes
+
+;  Uncomment the following if you wish to sync unix and smbpasswd 
+;   unix password sync = yes
+
 [homes]
    comment = Home Directories
    browseable = no

packaging/Solaris/pkg-specs/pkginfo

@@ -1,12 +1,12 @@
-PSTAMP=Mon Sep 29 17:26:14 BST 1997
 PKG=samba
 NAME=SMB based file/printer sharing
-VERSION=1.9.17p2,REV=1
 ARCH=sparc
+VERSION=2.0.6
 CATEGORY=system
-VENDOR=samba group
+VENDOR=Samba Group
 DESC=File and printer sharing for NT workstations
-CLASSES=none
-INTONLY=1
 HOTLINE=Please contact your local UNIX support group
-BASEDIR=/
+EMAIL=samba@samba.org
+CLASSES=none
+BASEDIR=/usr/local
+INTONLY=1

packaging/SuSE/5.2/samba.spec

@@ -67,7 +67,6 @@ fi
 /usr/bin/smbclient
 /usr/bin/smbmount
 /usr/bin/smbpasswd
-/usr/bin/smbrun
 /usr/bin/smbstatus
 /usr/bin/smbtar
 /usr/bin/smbumount
@@ -109,8 +108,6 @@ Samba includes the following programs (in summary):
 * smbd, the SMB server. This handles actual connections from clients.
 * nmbd, the Netbios name server, which helps clients locate servers.
 * smbclient, the Unix-hosted client program.
-* smbrun, a little 'glue' program to help the server run external
-programs. 
 * testprns, a program to test server access to printers.
 * testparm, a program to test the Samba configuration file for correctness.
 * smb.conf, the Samba configuration file.

source3/.cvsignore

@@ -1,4 +1,4 @@
-bin
+mbin
 Makefile
 config.cache
 config.h

source3/Makefile.in

@@ -27,7 +27,7 @@ BINDIR = @bindir@
 # the previous releases of Samba
 SBINDIR = @bindir@
 LIBDIR = @libdir@
-VARDIR = $(BASEDIR)/var
+VARDIR = @localstatedir@
 MANDIR = @mandir@
 
 # The permissions to give the executables
@@ -36,32 +36,28 @@ INSTALLPERMS = 0755
 # set these to where to find various files
 # These can be overridden by command line switches (see smbd(8))
 # or in smb.conf (see smb.conf(5))
-LOGFILEBASE = $(VARDIR)
+SMBLOGFILE = $(VARDIR)/log.smb
-SMBLOGFILE = $(LOGFILEBASE)/log.smb
+NMBLOGFILE = $(VARDIR)/log.nmb
-NMBLOGFILE = $(LOGFILEBASE)/log.nmb
 CONFIGFILE = $(LIBDIR)/smb.conf
 LMHOSTSFILE = $(LIBDIR)/lmhosts
 DRIVERFILE = $(LIBDIR)/printers.def
-FORMSFILE = $(LIBDIR)/ntforms.def
-NTDRIVERSDIR = $(LIBDIR)
 PASSWD_PROGRAM = /bin/passwd
-SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
+# This is where smbpasswd et al go
-SMB_PASSGRP_FILE = $(BASEDIR)/private/smbpassgrp
+PRIVATEDIR = @privatedir@
-SMB_GROUP_FILE = $(BASEDIR)/private/smbgroup
+
-SMB_ALIAS_FILE = $(BASEDIR)/private/smbalias
+SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
-SMB_PASSWD_PROGRAM = $(BINDIR)/smbpasswd
 
 # This is where SWAT images and help files go
-SWATDIR = $(BASEDIR)/swat
+SWATDIR = @swatdir@
 
 # the directory where lock files go
-LOCKDIR = $(VARDIR)/locks
+LOCKDIR = @lockdir@
 
 # The directory where code page definition files go
 CODEPAGEDIR = $(LIBDIR)/codepages
 
 # The current codepage definition list.
-CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936
+CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936 ISO8859-1 ISO8859-2 ISO8859-5 ISO8859-7 KOI-R
 
 # where you are going to have the smbrun binary. This defaults to the 
 # install directory. This binary is needed for correct printing
@@ -71,37 +67,22 @@ CODEPAGELIST= 437 737 850 852 861 932 866 949 950 936
 SMBRUN = $(BINDIR)/smbrun
 
 
-PASSWD_FLAGS = \
+PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
-		-DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\"           \
+FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
-		-DSMB_PASSWD_PROGRAM=\"$(SMB_PASSWD_PROGRAM)\"   \
-		-DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"         \
-		-DSMB_PASSGRP_FILE=\"$(SMB_PASSGRP_FILE)\"       \
-		-DSMB_GROUP_FILE=\"$(SMB_GROUP_FILE)\"           \
-		-DSMB_ALIAS_FILE=\"$(SMB_ALIAS_FILE)\" 
-FLAGS1 = $(CFLAGS)	\
-		-Iinclude -I$(srcdir)/include \
-		-I$(srcdir)/ubiqx \
-		-I$(srcdir)/smbwrapper \
-		$(CPPFLAGS) \
-		-DLOGFILEBASE=\"$(LOGFILEBASE)\" \
-		-DSMBLOGFILE=\"$(SMBLOGFILE)\" \
-		-DNMBLOGFILE=\"$(NMBLOGFILE)\"
 FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
-FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
+FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
 FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
-FLAGS  = $(FLAGS5) $(PASSWD_FLAGS)
+FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
+FLAGS32  = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
 
-SPROGS = bin/smbd bin/lsarpcd bin/svcctld bin/spoolssd bin/samrd \
+SPROGS = bin/smbd bin/nmbd bin/swat
-         bin/srvsvcd bin/wkssvcd bin/browserd bin/netlogond bin/winregd \
+PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus @RUNPROG@
-         bin/nmbd bin/swat
+PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage bin/make_unicodemap @WRAP@ @WRAP32@
-PROGS1 = bin/smbclient bin/testparm bin/testprns bin/smbrun bin/smbstatus 
-PROGS2 = bin/rpcclient bin/smbpasswd bin/make_smbcodepage bin/debug2html 
-PROGS3 = @WRAP@ @WRAP32@
 MPROGS = @MPROGS@
-PROGS = $(PROGS1) $(PROGS2) $(PROGS3) $(MPROGS) bin/nmblookup bin/make_printerdef 
+PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup bin/make_printerdef 
 
-SCRIPTS = script/smbtar script/addtosmbpass script/convert_smbpasswd
+SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/addtosmbpass $(srcdir)/script/convert_smbpasswd
 
 QUOTAOBJS=@QUOTAOBJS@
 
@@ -109,28 +90,18 @@ QUOTAOBJS=@QUOTAOBJS@
 # object file lists
 ######################################################################
 
-LIBSTATUS_OBJ = lib/util_status.o 
-
 LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
-          lib/getsmbpass.o lib/interface.o lib/kanji.o \
+          lib/getsmbpass.o lib/interface.o lib/kanji.o lib/md4.o \
-          lib/md5.o lib/hmacmd5.o lib/md4.o \
+          lib/interfaces.o lib/pidfile.o lib/replace.o \
-          lib/membuffer.o lib/netmask.o lib/pidfile.o lib/replace.o \
           lib/signal.o lib/slprintf.o lib/system.o lib/doscalls.o lib/time.o \
-		  lib/ufc.o lib/util.o lib/genrand.o lib/username.o \
+	  lib/ufc.o lib/genrand.o lib/username.o lib/access.o lib/smbrun.o \
-		lib/vuser.o \
+	  lib/bitmap.o lib/crc32.o lib/snprintf.o \
-		lib/access.o lib/smbrun.o \
+	  lib/util_str.o lib/util_sid.o \
-	  lib/bitmap.o lib/crc32.o lib/util_sid.o lib/snprintf.o \
+	  lib/util_unistr.o lib/util_file.o \
-		lib/util_str.o lib/util_unistr.o \
+	  lib/util.o lib/util_sock.o lib/util_sec.o smbd/ssl.o lib/fnmatch.o
-		lib/util_file.o mem_man/mem_man.o \
-		lib/util_sock.o \
-		lib/util_array.o \
-		lib/vagent.o \
-		lib/util_hnd.o
-
-LIBSRV_OBJ = lib/passcheck.o
 
 UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \
-            ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o
+            ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o ubiqx/debugparse.o
 
 PARAM_OBJ = param/loadparm.o param/params.o 
 
@@ -139,72 +110,35 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/namequery.o libsmb/nmblib.o \
              libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
 	     libsmb/passchange.o
 
-RPC_SRVUTIL_OBJ = \
+RPC_SERVER_OBJ = rpc_server/srv_lsa.o \
-		rpc_server/srv_pipe_hnd.o \
+                 rpc_server/srv_lsa_hnd.o rpc_server/srv_netlog.o \
+                 rpc_server/srv_pipe_hnd.o rpc_server/srv_reg.o \
+                 rpc_server/srv_samr.o rpc_server/srv_srvsvc.o \
+                 rpc_server/srv_util.o rpc_server/srv_wkssvc.o \
 		rpc_server/srv_pipe.o
 
-RPC_SERVER_OBJ = $(RPC_SRVUTIL_OBJ)
+RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_misc.o \
-
+                rpc_parse/parse_net.o rpc_parse/parse_prs.o \
-RPC_PARSE_OBJ1 = rpc_parse/parse_lsa.o \
+                rpc_parse/parse_reg.o rpc_parse/parse_rpc.o \
-                rpc_parse/parse_net.o \
+                rpc_parse/parse_samr.o rpc_parse/parse_srv.o \
-                rpc_parse/parse_reg.o \
+                rpc_parse/parse_wks.o rpc_parse/parse_sec.o
-                rpc_parse/parse_samr.o \
-		rpc_parse/parse_srv.o \
-                rpc_parse/parse_wks.o \
-                rpc_parse/parse_svc.o \
-		rpc_parse/parse_at.o \
-		rpc_parse/parse_spoolss.o \
-		rpc_parse/parse_eventlog.o \
-		rpc_parse/parse_brs.o
-
-RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o \
-		rpc_parse/parse_prs.o \
-		rpc_parse/parse_misc.o \
-		rpc_parse/parse_creds.o \
-		rpc_parse/parse_sec.o \
-		lib/msrpc-agent.o \
-		lib/msrpc-client.o \
-		lib/msrpc_use.o \
-
-RPC_PARSE_OBJ = $(RPC_PARSE_OBJ1) $(RPC_PARSE_OBJ2)
 
 RPC_CLIENT_OBJ = \
 		rpc_client/cli_login.o    \
 		rpc_client/cli_netlogon.o \
-		rpc_client/cli_reg.o \
 		rpc_client/cli_pipe.o     \
-		rpc_client/cli_connect.o     \
-		rpc_client/cli_use.o     \
-		rpc_client/cli_spoolss.o   \
 		rpc_client/cli_lsarpc.o   \
 		rpc_client/cli_wkssvc.o   \
-		rpc_client/cli_brs.o   \
 		rpc_client/cli_srvsvc.o   \
-		rpc_client/cli_svcctl.o \
+		rpc_client/cli_reg.o   \
-		rpc_client/cli_samr.o   \
+		rpc_client/cli_samr.o 
-		rpc_client/msrpc_samr.o   \
+
-		rpc_client/msrpc_netlogon.o   \
-		rpc_client/msrpc_lsarpc.o   \
-		rpc_client/cli_atsvc.o \
-		rpc_client/cli_eventlog.o \
-		libsmb/clienttrust.o
 
 LOCKING_OBJ = locking/locking.o locking/locking_shm.o locking/locking_slow.o \
               locking/shmem.o locking/shmem_sysv.o
 
-GROUPDB_OBJ = groupdb/groupdb.o groupdb/aliasdb.o groupdb/builtindb.o \
-		groupdb/groupfile.o groupdb/aliasfile.o \
-		groupdb/groupunix.o groupdb/aliasunix.o groupdb/builtinunix.o \
-		groupdb/groupldap.o groupdb/aliasldap.o groupdb/builtinldap.o \
-		passdb/passgrp.o passdb/smbpassgroup.o \
-		passdb/smbpassgroupunix.o passdb/passgrpldap.o
-
-SAMPASSDB_OBJ = passdb/sampassdb.o passdb/sampass.o passdb/sampassldap.o passdb/mysqlsampass.o
-
 PASSDB_OBJ = passdb/passdb.o passdb/smbpassfile.o passdb/smbpass.o \
-             passdb/pass_check.o passdb/ldap.o passdb/nispass.o \
+             passdb/pass_check.o passdb/ldap.o passdb/nispass.o passdb/smbpasschange.o
-             passdb/smbpasschange.o passdb/mysqlpass.o \
-             lib/util_pwdb.o lib/domain_namemap.o lib/sids.o
 
 PROFILE_OBJ = profile/profile.o
 
@@ -212,139 +146,17 @@ SMBD_OBJ1 = smbd/server.o smbd/files.o smbd/chgpasswd.o smbd/connection.o \
             smbd/dfree.o smbd/dir.o smbd/password.o smbd/conn.o smbd/fileio.o \
             smbd/ipc.o smbd/mangle.o smbd/negprot.o \
             smbd/message.o smbd/nttrans.o smbd/pipes.o smbd/predict.o \
-            smbd/$(QUOTAOBJS) smbd/reply.o smbd/ssl.o smbd/trans2.o smbd/uid.o \
+            smbd/$(QUOTAOBJS) smbd/reply.o smbd/trans2.o smbd/uid.o \
 	    smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o smbd/blocking.o \
-	    smbd/process.o smbd/oplock.o smbd/service.o smbd/error.o smbd/vfs.o \
+	    smbd/process.o smbd/oplock.o smbd/service.o smbd/error.o
-	    smbd/vfs-wrap.o smbd/dfs.o \
-		rpc_server/srv_lookup.o \
-		smbd/challenge.o
 
-PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/printing.o
+PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/printing.o \
-
+		printing/print_cups.o
-MSRPCD_OBJ = msrpc/msrpcd.o \
-		msrpc/msrpcd_process.o \
-                rpc_parse/parse_net.o \
-		rpc_client/cli_login.o    \
-		rpc_client/cli_netlogon.o \
-		rpc_client/cli_pipe.o     \
-		rpc_client/cli_connect.o     \
-		rpc_client/cli_use.o     \
-		rpc_client/msrpc_netlogon.o   \
-		smbd/uid.o
-
-BROWSERD_OBJ1 = browserd/browserd.o \
-		passdb/smbpassfile.o \
-		rpc_parse/parse_brs.o \
-		rpc_server/srv_brs.o
-
-WKSSVCD_OBJ1 = wkssvcd/wkssvcd.o \
-		passdb/smbpassfile.o \
-                rpc_parse/parse_wks.o \
-		rpc_server/srv_wkssvc.o
-
-SRVSVCD_OBJ1 = srvsvcd/srvsvcd.o \
-		passdb/smbpassfile.o \
-		rpc_parse/parse_srv.o \
-		rpc_server/srv_srvsvc.o
-
-WINREGD_OBJ1 = winregd/winregd.o \
-		passdb/smbpassfile.o \
-                rpc_parse/parse_reg.o \
-		rpc_server/srv_reg.o
-
-NETLOGOND_OBJ1 = netlogond/netlogond.o \
-		rpc_server/srv_netlog.o \
-		rpc_server/srv_lookup.o \
-		rpc_client/cli_lsarpc.o   \
-                rpc_parse/parse_lsa.o \
-		smbd/chgpasswd.o
-
-SAMRD_OBJ1 = samrd/samrd.o \
-		rpc_server/srv_lookup.o \
-                rpc_parse/parse_samr.o \
-		rpc_client/cli_lsarpc.o   \
-                rpc_parse/parse_lsa.o \
-		rpc_server/srv_samr.o smbd/chgpasswd.o
-
-SVCCTLD_OBJ1 = svcctld/svcctld.o \
-		passdb/smbpassfile.o \
-                rpc_parse/parse_svc.o \
-		rpc_server/srv_svcctl.o
-
-LSARPCD_OBJ1 = lsarpcd/lsarpcd.o \
-		rpc_server/srv_lookup.o \
-		rpc_client/cli_lsarpc.o   \
-                rpc_parse/parse_lsa.o \
-		rpc_server/srv_lsa.o
-
-SPOOLSSD_OBJ1 = spoolssd/spoolssd.o \
-		rpc_server/srv_spoolss.o \
-		passdb/smbpassfile.o \
-		rpc_parse/parse_spoolss.o \
-		printing/nt_printing.o 
 
 SMBD_OBJ = $(SMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
            $(RPC_SERVER_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
-           $(LOCKING_OBJ) $(SAMPASSDB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+           $(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ)
-		$(LIBSTATUS_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
 
-SRVSVCD_OBJ = $(MSRPCD_OBJ) $(SRVSVCD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSTATUS_OBJ) $(LIBSRV_OBJ)
-
-WKSSVCD_OBJ = $(MSRPCD_OBJ) $(WKSSVCD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-BROWSERD_OBJ = $(MSRPCD_OBJ) $(BROWSERD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-WINREGD_OBJ = $(MSRPCD_OBJ) $(WINREGD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-SVCCTLD_OBJ = $(MSRPCD_OBJ) $(SVCCTLD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-LSARPCD_OBJ = $(MSRPCD_OBJ) $(LSARPCD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(SAMPASSDB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-		$(LIBSTATUS_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-SPOOLSSD_OBJ = $(MSRPCD_OBJ) $(SPOOLSSD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) $(PRINTING_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-NETLOGOND_OBJ = $(MSRPCD_OBJ) $(NETLOGOND_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(SAMPASSDB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-		$(LIBSTATUS_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
-
-SAMRD_OBJ = $(MSRPCD_OBJ) $(SAMRD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(UBIQX_OBJ) \
-           $(RPC_SRVUTIL_OBJ) $(RPC_PARSE_OBJ2) \
-           $(LOCKING_OBJ) $(SAMPASSDB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-		$(LIBSTATUS_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
-		$(LIBSRV_OBJ)
 
 NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
             nmbd/nmbd_become_lmb.o nmbd/nmbd_browserdb.o \
@@ -360,25 +172,28 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
             nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
 
 NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
-            $(LIB_OBJ) $(RPC_PARSE_OBJ2)
+           $(LIB_OBJ)
 
 SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
            web/swat.o $(LIBSMB_OBJ) $(LOCKING_OBJ) \
            $(PARAM_OBJ) $(PASSDB_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
-           $(UBIQX_OBJ) $(LIB_OBJ)
+           $(UBIQX_OBJ) $(LIB_OBJ) $(PRINTING_OBJ)
 
-SMBRUN_OBJ = utils/smbrun.o
+SMBRUN_OBJ = utils/smbrun.o lib/util_sec.o
 
 SMBSH_OBJ = smbwrapper/smbsh.o smbwrapper/shared.o \
-            $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
+            $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
 
 MAKE_SMBCODEPAGE_OBJ = utils/make_smbcodepage.o $(PARAM_OBJ) \
                        $(UBIQX_OBJ) $(LIB_OBJ)
 
+MAKE_UNICODEMAP_OBJ = utils/make_unicodemap.o $(PARAM_OBJ) \
+                       $(UBIQX_OBJ) $(LIB_OBJ)
+
 MAKE_PRINTERDEF_OBJ = utils/make_printerdef.o $(PARAM_OBJ) \
                       $(UBIQX_OBJ) $(LIB_OBJ)
 
-STATUS_OBJ = utils/status.o $(LIBSTATUS_OBJ) $(LOCKING_OBJ) $(PARAM_OBJ) \
+STATUS_OBJ = utils/status.o $(LOCKING_OBJ) $(PARAM_OBJ) \
              $(UBIQX_OBJ) $(PROFILE_OBJ) $(LIB_OBJ)
 
 TESTPARM_OBJ = utils/testparm.o \
@@ -387,32 +202,17 @@ TESTPARM_OBJ = utils/testparm.o \
 TESTPRNS_OBJ = utils/testprns.o $(PARAM_OBJ) $(PRINTING_OBJ) $(UBIQX_OBJ) \
                $(LIB_OBJ)
 
-SMBPASSWD_OBJ = utils/smbpasswd.o rpc_client/cli_netlogon_sync.o \
+SMBPASSWD_OBJ = utils/smbpasswd.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
-		$(PARAM_OBJ) $(LIBSMB_OBJ) \
-		$(PASSDB_OBJ) \
                 $(UBIQX_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(LIB_OBJ)
 
 RPCCLIENT_OBJ = rpcclient/rpcclient.o \
-		rpcclient/display_at.o \
+             rpcclient/display.o \
-		rpcclient/display_event.o \
-		rpcclient/display_reg.o \
-		rpcclient/display_sam.o \
-		rpcclient/display_sec.o \
-		rpcclient/display_spool.o \
-		rpcclient/display_srv.o \
-		rpcclient/display_svc.o \
-		rpcclient/display_sync.o \
              rpcclient/cmd_lsarpc.o \
              rpcclient/cmd_wkssvc.o \
-		rpcclient/cmd_brs.o \
              rpcclient/cmd_samr.o \
              rpcclient/cmd_reg.o \
              rpcclient/cmd_srvsvc.o \
-		rpcclient/cmd_svcctl.o \
              rpcclient/cmd_netlogon.o \
-		rpcclient/cmd_atsvc.o \
-		rpcclient/cmd_spoolss.o \
-		rpcclient/cmd_eventlog.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
              $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ)
 
@@ -423,9 +223,11 @@ SMBWRAPPER_OBJ = smbwrapper/smbw.o smbwrapper/wrapped.o \
                 $(UBIQX_OBJ) $(LIB_OBJ)
 
 CLIENT_OBJ = client/client.o client/clitar.o \
-             $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
+             $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
 
-MOUNT_OBJ = client/smbmount.o client/clientutil.o \
+CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
+
+MOUNT_OBJ = client/smbmount.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
 
 MNT_OBJ = client/smbmnt.o \
@@ -434,23 +236,13 @@ MNT_OBJ = client/smbmnt.o \
 UMOUNT_OBJ = client/smbumount.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
 
-NMB_AGENT_OBJ = utils/nmb-agent.o $(PARAM_OBJ) $(UBIQX_OBJ) \
-                $(LIBSMB_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
-
 NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(UBIQX_OBJ) \
-                $(LIBSMB_OBJ) $(LIB_OBJ) $(RPC_PARSE_OBJ2)
+                $(LIBSMB_OBJ) $(LIB_OBJ)
 
-DEBUG2HTML_OBJ = utils/debug2html.o $(PARAM_OBJ) $(LIB_OBJ)
+SMBTORTURE_OBJ = utils/torture.o utils/nbio.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
-
-SMB_AGENT_OBJ = utils/smb-agent.o $(LIBSMB_OBJ) $(PARAM_OBJ) $(LIB_OBJ) \
-			$(RPC_PARSE_OBJ2) rpc_client/cli_use.o
-
-SMB_CLIENT_OBJ = smb-client.o $(PARAM_OBJ) $(LIB_OBJ)
-
-SMBTORTURE_OBJ = utils/torture.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
-SMBFILTER_OBJ = utils/smbfilter.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
+MASKTEST_OBJ = utils/masktest.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
 RPCTORTURE_OBJ = utils/rpctorture.o \
@@ -461,15 +253,15 @@ RPCTORTURE_OBJ = utils/rpctorture.o \
              rpcclient/cmd_srvsvc.o \
              rpcclient/cmd_netlogon.o \
              $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \
-             $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
+             $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ)
-		$(PASSDB_OBJ) 
 
-PROTO_OBJ = $(MSRPCD_OBJ) $(SVCCTLD_OBJ1) $(WINREGD_OBJ1) $(SAMRD_OBJ1) \
+DEBUG2HTML_OBJ = utils/debug2html.o ubiqx/debugparse.o
-		$(SRVSVCD_OBJ1) $(WKSSVCD_OBJ1) $(BROWSERD_OBJ1) \
+
-		$(SPOOLSSD_OBJ1) $(NETLOGOND_OBJ1) \
+SMBFILTER_OBJ = utils/smbfilter.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
-		$(LSARPCD_OBJ1) $(SMBD_OBJ) $(NMBD_OBJ) \
+                 $(UBIQX_OBJ) $(LIB_OBJ)
-		$(SWAT_OBJ) $(CLIENT_OBJ) \
+
-	    $(RPCCLIENT_OBJ) $(SMBWRAPPER_OBJ) $(SMBPASSWD_OBJ)
+PROTO_OBJ = $(SMBD_OBJ) $(NMBD_OBJ) $(SWAT_OBJ) $(CLIENT_OBJ) \
+	    $(RPCCLIENT_OBJ) $(SMBWRAPPER_OBJ) $(SMBTORTURE_OBJ)
 
 PICOBJS = $(SMBWRAPPER_OBJ:.o=.po)
 PICOBJS32 = $(SMBWRAPPER_OBJ:.o=.po32)
@@ -480,20 +272,24 @@ PICOBJS32 = $(SMBWRAPPER_OBJ:.o=.po32)
 
 all : CHECK $(SPROGS) $(PROGS) 
 
-smbwrapper : CHECK bin/smbsh bin/smbwrapper.so @WRAP32@
+smbwrapper : CHECK bin/smbsh bin/smbwrapper.@SHLIBEXT@ @WRAP32@
 
 smbtorture : CHECK bin/smbtorture
 
+masktest : CHECK bin/masktest
+
 rpctorture : CHECK bin/rpctorture
 
-smbfilter : CHECK bin/smbfilter
+debug2html : CHECK bin/debug2html
 
+smbfilter : CHECK bin/smbfilter
 
 .SUFFIXES:
 .SUFFIXES: .c .o .po .po32
 
 CHECK:
 	@echo "Using FLAGS = $(FLAGS)"
+	@echo "Using FLAGS32 = $(FLAGS32)"
 	@echo "Using LIBS = $(LIBS)"
 
 MAKEDIR = || exec false; \
@@ -516,6 +312,7 @@ MAKEDIR = || exec false; \
 	@echo Compiling $*.c
 	@$(CC) -I. -I$(srcdir) $(FLAGS) -c $< \
 	  -o $@ @MAINT@ -Wp,-MD,.deps/$@
+@BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
 @MAINT@	@sed 's|^'`echo $@ | sed 's,.*/,,'`':|$@:|' \
 @MAINT@	  <.deps/$@ >.deps/$@d && \
 @MAINT@	rm -f .deps/$@ && : >.deps/.stamp
@@ -529,6 +326,7 @@ MAKEDIR = || exec false; \
 	@echo Compiling $*.c with @PICFLAG@
 	@$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< \
 	  -o $*.po.o @MAINT@ -Wp,-MD,.deps/$@
+@BROKEN_CC@	-mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@.o
 @MAINT@	@sed 's|^'`echo $*\.po\.o | sed 's,.*/,,'`':|$@:|' \
 @MAINT@	  <.deps/$@ >.deps/$@d && \
 @MAINT@	rm -f .deps/$@ && : >.deps/.stamp
@@ -542,8 +340,9 @@ MAKEDIR = || exec false; \
 @MAINT@	 else dir=.deps/`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` \
 @MAINT@	      $(MAKEDIR); fi; rm -f .deps/$@ .deps/$@d
 	@echo Compiling $*.c with @PICFLAG@ and -32
-	@$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< \
+	@$(CC) -32 -I. -I$(srcdir) $(FLAGS32) @PICFLAG@ -c $< \
 	  -o $*.po32.o @MAINT@ -Wp,-MD,.deps/$@
+@BROKEN_CC@	-mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po32$$%.o%'` $@.o
 @MAINT@	@sed 's|^'`echo $*.po32.o | sed 's,.*/,,'`':|$@:|' \
 @MAINT@	  <.deps/$@ >.deps/$@d && \
 @MAINT@	rm -f .deps/$@ && : >.deps/.stamp
@@ -558,42 +357,6 @@ bin/smbd: $(SMBD_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LIBS) 
 
-bin/svcctld: $(SVCCTLD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SVCCTLD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/lsarpcd: $(LSARPCD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(LSARPCD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/spoolssd: $(SPOOLSSD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SPOOLSSD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/srvsvcd: $(SRVSVCD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SRVSVCD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/wkssvcd: $(WKSSVCD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(WKSSVCD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/browserd: $(BROWSERD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(BROWSERD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/winregd: $(WINREGD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(WINREGD_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/netlogond: $(NETLOGOND_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NETLOGOND_OBJ) $(LDFLAGS) $(LIBS) 
-
-bin/samrd: $(SAMRD_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SAMRD_OBJ) $(LDFLAGS) $(LIBS) 
-
 bin/nmbd: $(NMBD_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(LIBS)
@@ -614,6 +377,10 @@ bin/smbclient: $(CLIENT_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS)
 
+bin/smbspool: $(CUPS_OBJ) bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(LDFLAGS) $(LIBS)
+
 bin/smbmount: $(MOUNT_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(LIBS)
@@ -646,6 +413,10 @@ bin/make_smbcodepage: $(MAKE_SMBCODEPAGE_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LDFLAGS) $(LIBS)
 
+bin/make_unicodemap: $(MAKE_UNICODEMAP_OBJ) bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(MAKE_UNICODEMAP_OBJ) $(LDFLAGS) $(LIBS)
+
 bin/nmblookup: $(NMBLOOKUP_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(LIBS)
@@ -658,35 +429,27 @@ bin/smbtorture: $(SMBTORTURE_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS)
 
+bin/masktest: $(MASKTEST_OBJ) bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(LIBS)
+
 bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(LIBS)
 
-bin/smb-client: $(SMB_CLIENT_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMB_CLIENT_OBJ) $(LDFLAGS) $(LIBS)
-
-bin/nmb-agent: $(NMB_AGENT_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NMB_AGENT_OBJ) $(LDFLAGS) $(LIBS)
-
-bin/smb-agent: $(SMB_AGENT_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMB_AGENT_OBJ) $(LDFLAGS) $(LIBS)
-
-bin/smbfilter: $(SMBFILTER_OBJ) bin/.dummy
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS)
-
 bin/debug2html: $(DEBUG2HTML_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(LIBS)
 
-bin/smbwrapper.so: $(PICOBJS)
+bin/smbfilter: $(SMBFILTER_OBJ) bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS)
+
+bin/smbwrapper.@SHLIBEXT@: $(PICOBJS)
 	@echo Linking shared library $@
 	@$(LD) @LDSHFLAGS@ -o $@ $(PICOBJS) $(LIBS)
 
-bin/smbwrapper.32.so: $(PICOBJS32)
+bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32)
 	@echo Linking shared library $@
 	@$(LD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
 
@@ -700,6 +463,9 @@ installdirs:
 	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
 	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
 
+installservers: all installdirs
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
+
 installbin: all installdirs
 	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
 	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
@@ -737,17 +503,17 @@ uninstallcp:
 	@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
 
 clean: 
-	-rm -f core */*~ *~ */*.o */*.po */*.po32 */*.so
+	-rm -f core */*~ *~ */*.o */*.po */*.po32 */*.@SHLIBEXT@
 
 proto: 
 	@echo rebuilding include/proto.h
 	@cd $(srcdir) && $(AWK) -f script/mkproto.awk `echo $(PROTO_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > include/proto.h
 
 etags:
-	etags `find . -name "*.[ch]"`
+	etags `find . -name "*.[ch]" | grep -v /CVS/`
 
 ctags:
-	ctags `find . -name "*.[ch]"`
+	ctags `find . -name "*.[ch]" | grep -v /CVS/`
 
 realclean: clean
 	-rm -f config.log $(PROGS) $(SPROGS) bin/.dummy

source3/acconfig.h

@@ -1,3 +1,4 @@
+#undef HAVE_VOLATILE
 #undef HAVE_BROKEN_READDIR
 #undef HAVE_ERRNO_DECL
 #undef HAVE_LONGLONG
@@ -5,6 +6,7 @@
 #undef HAVE_REMSH
 #undef HAVE_UNSIGNED_CHAR
 #undef HAVE_UTIMBUF
+#undef HAVE_SIG_ATOMIC_T_TYPE
 #undef ssize_t
 #undef ino_t
 #undef ssize_t
@@ -22,19 +24,22 @@
 #undef AIX
 #undef BSD
 #undef IRIX
+#undef IRIX6
 #undef HPUX
 #undef QNX
 #undef SCO
 #undef OSF1
 #undef NEXT2
+#undef RELIANTUNIX
 #undef HAVE_SHARED_MMAP
+#undef HAVE_MMAP
 #undef HAVE_SYSV_IPC
 #undef HAVE_FCNTL_LOCK
 #undef HAVE_FTRUNCATE_EXTEND
+#undef FTRUNCATE_NEEDS_ROOT
 #undef HAVE_TRAPDOOR_UID
 #undef HAVE_ROOT
 #undef HAVE_UNION_SEMUN
-#undef HAVE_NETMASK_IFCONF
 #undef HAVE_GETTIMEOFDAY_TZ
 #undef HAVE_SOCK_SIN_LEN
 #undef STAT_READ_FILSYS
@@ -45,28 +50,27 @@
 #undef STAT_STATFS4
 #undef STAT_STATVFS
 #undef STAT_STATVFS64
-#undef HAVE_NETMASK_IFREQ
+#undef HAVE_IFACE_AIX
-#undef HAVE_NETMASK_AIX
+#undef HAVE_IFACE_IFCONF
+#undef HAVE_IFACE_IFREQ
 #undef HAVE_CRYPT
 #undef HAVE_PUTPRPWNAM
 #undef HAVE_SET_AUTH_PARAMETERS
-#undef WITH_MMAP
 #undef WITH_SYSLOG
 #undef WITH_PROFILE
 #undef WITH_SSL
 #undef WITH_LDAP
 #undef WITH_NISPLUS
+#undef WITH_PAM
 #undef WITH_NISPLUS_HOME
 #undef WITH_AUTOMOUNT
 #undef WITH_SMBMOUNT
-#undef HAVE_PAM_AUTHENTICATE
 #undef HAVE_BROKEN_GETGROUPS
 #undef REPLACE_GETPASS
 #undef REPLACE_INET_NTOA
 #undef HAVE_FILE_MACRO
 #undef HAVE_FUNCTION_MACRO
 #undef HAVE_SETRESUID_DECL
-#undef HAVE_CRYPT_DECL
 #undef HAVE_SETRESUID
 #undef WITH_NETATALK
 #undef HAVE_INO64_T
@@ -75,7 +79,6 @@
 #undef SIZEOF_OFF_T
 #undef STAT_STATVFS64
 #undef HAVE_LIBREADLINE
-#undef HAVE_READLINE_FCF_PROTO
 #undef HAVE_KERNEL_OPLOCKS
 #undef HAVE_IRIX_SPECIFIC_CAPABILITIES
 #undef HAVE_INT16_FROM_RPC_RPC_H
@@ -83,8 +86,29 @@
 #undef HAVE_INT32_FROM_RPC_RPC_H
 #undef HAVE_UINT32_FROM_RPC_RPC_H
 #undef KRB4_AUTH
+#undef KRB5_AUTH
 #undef SEEKDIR_RETURNS_VOID
 #undef HAVE_DIRENT_D_OFF
 #undef HAVE_GETSPNAM
 #undef HAVE_BIGCRYPT
 #undef HAVE_GETPRPWNAM
+#undef HAVE_FSTAT64
+#undef HAVE_LSTAT64
+#undef HAVE_STAT64
+#undef HAVE_SETRESGID
+#undef HAVE_SETRESGID_DECL
+#undef HAVE_SHADOW_H
+#undef HAVE_MEMSET
+#undef HAVE_STRCASECMP
+#undef HAVE_STRUCT_DIRENT64
+#undef HAVE_TRUNCATED_SALT
+#undef BROKEN_NISPLUS_INCLUDE_FILES
+#undef HAVE_RPC_AUTH_ERROR_CONFLICT
+#undef HAVE_EXPLICIT_LARGEFILE_SUPPORT
+#undef USE_BOTH_CRYPT_CALLS
+#undef HAVE_BROKEN_FCNTL64_LOCKS
+#undef HAVE_FNMATCH
+#undef USE_SETEUID
+#undef USE_SETRESUID
+#undef USE_SETREUID
+#undef USE_SETUIDX