diff options
82 files changed, 244 insertions, 169 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 2a06355f2b1..f4f4debda4c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,63 @@ - WHATS NEW IN Samba 2.0.0 + WHATS NEW IN Samba 2.0.2 ======================== +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. + +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. + +Bugfixes added since 2.0.1 +-------------------------- + +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 +69,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: diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html index 514affafb6e..f740c7573d2 100644 --- a/docs/htmldocs/smb.conf.5.html +++ b/docs/htmldocs/smb.conf.5.html @@ -789,11 +789,15 @@ will serve to packets coming in those interfaces. Note that you should not use this parameter for machines that are serving PPP or other intermittent or non-broadcast network interfaces as it will not cope with non-permanent interfaces. -<p><br>In addition, to change a users SMB password, the -<a href="smbpasswd.8.html"><strong>smbpasswd</strong></a> by default connects to the -<em>"localhost" - 127.0.0.1</em> address as an SMB client to issue the -password change request. If <strong>"bind interfaces only"</strong> is set then -unless the network address <em>127.0.0.1</em> is added to the +<p><br>If <strong>"bind interfaces only"</strong> is set then unless the network address +<em>127.0.0.1</em> is added to the <a href="smb.conf.5.html#interfaces"><strong>'interfaces'</strong></a> parameter +list <a href="smbpasswd.8.html"><strong>smbpasswd</strong></a> and +<a href="swat.8.html"><strong>swat</strong></a> may not work as expected due to the +reasons covered below. +<p><br>To change a users SMB password, the <a href="smbpasswd.8.html"><strong>smbpasswd</strong></a> +by default connects to the <em>"localhost" - 127.0.0.1</em> address as an SMB +client to issue the password change request. If <strong>"bind interfaces only"</strong> +is set then unless the network address <em>127.0.0.1</em> is added to the <a href="smb.conf.5.html#interfaces"><strong>'interfaces'</strong></a> parameter list then <a href="smbpasswd.8.html"><strong>smbpasswd</strong></a> will fail to connect in it's default mode. <a href="smbpasswd.8.html"><strong>smbpasswd</strong></a> can be forced to @@ -801,6 +805,13 @@ use the primary IP interface of the local host by using its <a href="smbpasswd.8.html#minusr"><strong>"-r remote machine"</strong></a> parameter, with <strong>"remote machine"</strong> set to the IP name of the primary interface of the local host. +<p><br>The <a href="swat.8.html"><strong>swat</strong></a> status page tries to connect with +<a href="smbd.8.html"><strong>smbd</strong></a> and <a href="nmbd.8.html"><strong>nmbd</strong></a> at the address +<em>127.0.0.1</em> to determine if they are running. Not adding <em>127.0.0.1</em> will cause +<a href="smbd.8.html"><strong>smbd</strong></a> and <a href="nmbd.8.html"><strong>nmbd</strong></a> to always show +"not running" even if they really are. This can prevent +<a href="swat.8.html"><strong>swat</strong></a> from starting/stopping/restarting +<a href="smbd.8.html"><strong>smbd</strong></a> and <a href="nmbd.8.html"><strong>nmbd</strong></a>. <p><br><strong>Default:</strong> <code> bind interfaces only = False</code> <p><br><strong>Example:</strong> diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5 index 534c2484150..64ca36d9df8 100644 --- a/docs/manpages/lmhosts.5 +++ b/docs/manpages/lmhosts.5 @@ -1,4 +1,4 @@ -.TH "lmhosts " "5" "23 Oct 1998" "Samba" "SAMBA" +.TH LMHOSTS 5 "07 Feb 1999" "lmhosts 2.0.1" .PP .SH "NAME" lmhosts \- The Samba NetBIOS hosts file diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1 index 9c134201078..245c29966c0 100644 --- a/docs/manpages/make_smbcodepage.1 +++ b/docs/manpages/make_smbcodepage.1 @@ -1,4 +1,4 @@ -.TH "make_smbcodepage " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH MAKE_SMBCODEPAGE 1 "07 Feb 1999" "make_smbcodepage 2.0.1" .PP .SH "NAME" make_codepage \- Construct a codepage file for Samba diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index 2c880faa427..cdc0f734bba 100644 --- a/docs/manpages/nmbd.8 +++ b/docs/manpages/nmbd.8 @@ -1,4 +1,4 @@ -.TH "nmbd" "8" "23 Oct 1998" "Samba" "SAMBA" +.TH NMBD 8 "07 Feb 1999" "nmbd 2.0.1" .PP .SH "NAME" nmbd \- NetBIOS name server to provide NetBIOS over IP diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1 index b6224353ba2..c7dea817bd1 100644 --- a/docs/manpages/nmblookup.1 +++ b/docs/manpages/nmblookup.1 @@ -1,4 +1,4 @@ -.TH "nmblookup " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH NMBLOOKUP 1 "07 Feb 1999" "nmblookup 2.0.1" .PP .SH "NAME" nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7 index 96975f34c26..06b0f17e39e 100644 --- a/docs/manpages/samba.7 +++ b/docs/manpages/samba.7 @@ -1,4 +1,4 @@ -.TH "Samba " "7" "23 Oct 1998" "Samba" "" +.TH SAMBA 7 "07 Feb 1999" "samba 2.0.1" .PP .SH "NAME" Samba \- A Windows SMB/CIFS fileserver for UNIX diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 7af81fa06a5..f0074d1708e 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -1,4 +1,4 @@ -.TH "smb\&.conf " "5" "23 Oct 1998" "Samba" "SAMBA" +.TH SMB.CONF 5 "07 Feb 1999" "smb.conf 2.0.1" .PP .SH "NAME" smb\&.conf \- The configuration file for the Samba suite @@ -1389,11 +1389,16 @@ should not use this parameter for machines that are serving PPP or other intermittent or non-broadcast network interfaces as it will not cope with non-permanent interfaces\&. .IP -In addition, to change a users SMB password, the -\fBsmbpasswd\fP by default connects to the -\fI"localhost" - 127\&.0\&.0\&.1\fP address as an SMB client to issue the -password change request\&. If \fB"bind interfaces only"\fP is set then -unless the network address \fI127\&.0\&.0\&.1\fP is added to the +If \fB"bind interfaces only"\fP is set then unless the network address +\fI127\&.0\&.0\&.1\fP is added to the \fB\'interfaces\'\fP parameter +list \fBsmbpasswd\fP and +\fBswat\fP may not work as expected due to the +reasons covered below\&. +.IP +To change a users SMB password, the \fBsmbpasswd\fP +by default connects to the \fI"localhost" - 127\&.0\&.0\&.1\fP address as an SMB +client to issue the password change request\&. If \fB"bind interfaces only"\fP +is set then unless the network address \fI127\&.0\&.0\&.1\fP is added to the \fB\'interfaces\'\fP parameter list then \fBsmbpasswd\fP will fail to connect in it\'s default mode\&. \fBsmbpasswd\fP can be forced to @@ -1402,6 +1407,14 @@ use the primary IP interface of the local host by using its \fB"remote machine"\fP set to the IP name of the primary interface of the local host\&. .IP +The \fBswat\fP status page tries to connect with +\fBsmbd\fP and \fBnmbd\fP at the address +\fI127\&.0\&.0\&.1\fP to determine if they are running\&. Not adding \fI127\&.0\&.0\&.1\fP will cause +\fBsmbd\fP and \fBnmbd\fP to always show +"not running" even if they really are\&. This can prevent +\fBswat\fP from starting/stopping/restarting +\fBsmbd\fP and \fBnmbd\fP\&. +.IP \fBDefault:\fP \f(CW bind interfaces only = False\fP .IP diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1 index 6d93c3cd51e..2b5e69cde17 100644 --- a/docs/manpages/smbclient.1 +++ b/docs/manpages/smbclient.1 @@ -1,4 +1,4 @@ -.TH "smbclient " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBCLIENT 1 "07 Feb 1999" "smbclient 2.0.1" .PP .SH "NAME" smbclient \- ftp-like client to access SMB/CIFS resources on servers diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8 index 7088cfd557e..d3ddcfdc17c 100644 --- a/docs/manpages/smbd.8 +++ b/docs/manpages/smbd.8 @@ -1,4 +1,4 @@ -.TH "smbd " "8" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBD 8 "07 Feb 1999" "smbd 2.0.1" .PP .SH "NAME" smbd \- server to provide SMB/CIFS services to clients diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8 index 6b8473e2b61..ff1718bab2e 100644 --- a/docs/manpages/smbmnt.8 +++ b/docs/manpages/smbmnt.8 @@ -1,4 +1,4 @@ -.TH SMBMNT 8 "15 Jan 1999" "smbmnt 2.0.0" +.TH SMBMNT 8 "07 Feb 1999" "smbmnt 2.0.1" .SH NAME smbmnt \- mount smb file system .SH SYNOPSIS diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8 index b87524f4ef6..465328e533d 100644 --- a/docs/manpages/smbmount.8 +++ b/docs/manpages/smbmount.8 @@ -1,4 +1,4 @@ -.TH SMBMOUNT 8 "15 Jan 1999" "smbmount 2.0.0" +.TH SMBMOUNT 8 "07 Feb 1999" "smbmount 2.0.1" .SH NAME smbmount \- mount smb file system .SH SYNOPSIS diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5 index e3fbcf161ee..5711d0150d1 100644 --- a/docs/manpages/smbpasswd.5 +++ b/docs/manpages/smbpasswd.5 @@ -1,4 +1,4 @@ -.TH "smbpasswd " "5" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBPASSWD 5 "07 Feb 1999" "smbpasswd 2.0.1" .PP .SH "NAME" smbpasswd \- The Samba encrypted password file diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8 index ad502e01b12..1d42ddda85a 100644 --- a/docs/manpages/smbpasswd.8 +++ b/docs/manpages/smbpasswd.8 @@ -1,4 +1,4 @@ -.TH "smbpasswd " "8" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBPASSWD 8 "07 Feb 1999" "smbpasswd 2.0.1" .PP .SH "NAME" smbpasswd \- change a users SMB password diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1 index d34b408d6bd..6f9e63ca755 100644 --- a/docs/manpages/smbrun.1 +++ b/docs/manpages/smbrun.1 @@ -1,4 +1,4 @@ -.TH "smbrun " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBRUN 1 "07 Feb 1999" "smbrun 2.0.1" .PP .SH "NAME" smbrun \- interface program between smbd and external programs diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1 index ddbbc7e8a53..1d432cfde4c 100644 --- a/docs/manpages/smbstatus.1 +++ b/docs/manpages/smbstatus.1 @@ -1,4 +1,4 @@ -.TH "smbstatus " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBSTATUS 1 "07 Feb 1999" "smbstatus 2.0.1" .PP .SH "NAME" smbstatus \- report on current Samba connections diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1 index 2aaa542231e..810bbc0ea64 100644 --- a/docs/manpages/smbtar.1 +++ b/docs/manpages/smbtar.1 @@ -1,4 +1,4 @@ -.TH "smbtar " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH SMBTAR 1 "07 Feb 1999" "smbtar 2.0.1" .PP .SH "NAME" smbtar \- shell script for backing up SMB/CIFS shares directly to UNIX tape drives diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8 index 2d0f78a0aba..d337d178197 100644 --- a/docs/manpages/smbumount.8 +++ b/docs/manpages/smbumount.8 @@ -1,4 +1,4 @@ -.TH SMBUMOUNT 8 "15 Jan 1999" "smbumount 2.0.0" +.TH SMBUMOUNT 8 "07 Feb 1999" "smbumount 2.0.1" .SH NAME smbumount \- umount for normal users .SH SYNOPSIS diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8 index a9e876aaf29..dd1b00d7f37 100644 --- a/docs/manpages/swat.8 +++ b/docs/manpages/swat.8 @@ -1,4 +1,4 @@ -.TH "swat " "8" "23 Oct 1998" "Samba" "SAMBA" +.TH SWAT 8 "07 Feb 1999" "swat 2.0.1" .PP .SH "NAME" swat \- swat - Samba Web Administration Tool diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index b75590aa9ad..ad186226fff 100644 --- a/docs/manpages/testparm.1 +++ b/docs/manpages/testparm.1 @@ -1,4 +1,4 @@ -.TH "testparm " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH TESTPARM 1 "07 Feb 1999" "testparm 2.0.1" .PP .SH "NAME" testparm \- check an smb\&.conf configuration file for internal correctness diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1 index bb366e329c3..34208bc28aa 100644 --- a/docs/manpages/testprns.1 +++ b/docs/manpages/testprns.1 @@ -1,4 +1,4 @@ -.TH "testprns " "1" "23 Oct 1998" "Samba" "SAMBA" +.TH TESTPRNS 1 "07 Feb 1999" "testprns 2.0.1" .PP .SH "NAME" testprns \- check printer name for validity with smbd diff --git a/docs/textdocs/Application_Serving.txt b/docs/textdocs/Application_Serving.txt index 3715bc4f57b..64740fce0d9 100644 --- a/docs/textdocs/Application_Serving.txt +++ b/docs/textdocs/Application_Serving.txt @@ -1,5 +1,5 @@ !== -!== Application_Serving.txt for Samba release 2.0.0 15 Jan 1999 +!== Application_Serving.txt for Samba release 2.0.1 07 Feb 1999 !== Contributed: January 7, 1997 Updated: March 24, 1998 diff --git a/docs/textdocs/BROWSING-Config.txt b/docs/textdocs/BROWSING-Config.txt index 2e5f4adc4e3..a6652ddeb93 100644 --- a/docs/textdocs/BROWSING-Config.txt +++ b/docs/textdocs/BROWSING-Config.txt @@ -1,5 +1,5 @@ !== -!== BROWSING-Config.txt for Samba release 2.0.0 15 Jan 1999 +!== BROWSING-Config.txt for Samba release 2.0.1 07 Feb 1999 !== Date: July 5, 1998 Contributor: John H Terpstra <jht@samba.org> diff --git a/docs/textdocs/BROWSING.txt b/docs/textdocs/BROWSING.txt index 2f3e0149ebd..a95b43999eb 100644 --- a/docs/textdocs/BROWSING.txt +++ b/docs/textdocs/BROWSING.txt @@ -1,5 +1,5 @@ !== -!== BROWSING.txt for Samba release 2.0.0 15 Jan 1999 +!== BROWSING.txt for Samba release 2.0.1 07 Feb 1999 !== Author/s: Many (Thanks to Luke, Jeremy, Andrew, etc.) Updated: July 5, 1998 diff --git a/docs/textdocs/BUGS.txt b/docs/textdocs/BUGS.txt index db8fdd99ba6..aea53563b0a 100644 --- a/docs/textdocs/BUGS.txt +++ b/docs/textdocs/BUGS.txt @@ -1,5 +1,5 @@ !== -!== BUGS.txt for Samba release 2.0.0 15 Jan 1999 +!== BUGS.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Samba Team Updated: June 27, 1997 diff --git a/docs/textdocs/CVS_ACCESS.txt b/docs/textdocs/CVS_ACCESS.txt index ae1244fb6c5..b982a53282b 100644 --- a/docs/textdocs/CVS_ACCESS.txt +++ b/docs/textdocs/CVS_ACCESS.txt @@ -1,5 +1,5 @@ !== -!== CVS_ACCESS.txt for Samba release 2.0.0 15 Jan 1999 +!== CVS_ACCESS.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Modified from the Web pages by Jeremy Allison. Date: 23 Dec 1997 diff --git a/docs/textdocs/DHCP-Server-Configuration.txt b/docs/textdocs/DHCP-Server-Configuration.txt index 49eb7908d17..91bccb874f1 100644 --- a/docs/textdocs/DHCP-Server-Configuration.txt +++ b/docs/textdocs/DHCP-Server-Configuration.txt @@ -1,5 +1,5 @@ !== -!== DHCP-Server-Configuration.txt for Samba release 2.0.0 15 Jan 1999 +!== DHCP-Server-Configuration.txt for Samba release 2.0.1 07 Feb 1999 !== Subject: DHCP Server Configuration for SMB Clients Date: March 1, 1998 diff --git a/docs/textdocs/DIAGNOSIS.txt b/docs/textdocs/DIAGNOSIS.txt index b39fc2545db..4fcb8927a16 100644 --- a/docs/textdocs/DIAGNOSIS.txt +++ b/docs/textdocs/DIAGNOSIS.txt @@ -1,5 +1,5 @@ !== -!== DIAGNOSIS.txt for Samba release 2.0.0 15 Jan 1999 +!== DIAGNOSIS.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Andrew Tridgell Updated: October 14, 1997 diff --git a/docs/textdocs/DNIX.txt b/docs/textdocs/DNIX.txt index 9bf6ba253dd..ef460fc2868 100644 --- a/docs/textdocs/DNIX.txt +++ b/docs/textdocs/DNIX.txt @@ -1,5 +1,5 @@ !== -!== DNIX.txt for Samba release 2.0.0 15 Jan 1999 +!== DNIX.txt for Samba release 2.0.1 07 Feb 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 diff --git a/docs/textdocs/DOMAIN.txt b/docs/textdocs/DOMAIN.txt index 4d98d58502e..ea1cccfa891 100644 --- a/docs/textdocs/DOMAIN.txt +++ b/docs/textdocs/DOMAIN.txt @@ -1,5 +1,5 @@ !== -!== DOMAIN.txt for Samba release 2.0.0 15 Jan 1999 +!== DOMAIN.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Samba Team Updated: December 4, 1998 (John H Terpstra) diff --git a/docs/textdocs/DOMAIN_CONTROL.txt b/docs/textdocs/DOMAIN_CONTROL.txt index e2edf3cbc83..b28fb731295 100644 --- a/docs/textdocs/DOMAIN_CONTROL.txt +++ b/docs/textdocs/DOMAIN_CONTROL.txt @@ -1,5 +1,5 @@ !== -!== DOMAIN_CONTROL.txt for Samba release 2.0.0 15 Jan 1999 +!== DOMAIN_CONTROL.txt for Samba release 2.0.1 07 Feb 1999 !== Initial Release: August 22, 1996 Contributor: John H Terpstra <samba-bugs@samba.org> diff --git a/docs/textdocs/DOMAIN_MEMBER.txt b/docs/textdocs/DOMAIN_MEMBER.txt index adfbf81251f..f54ca080fec 100644 --- a/docs/textdocs/DOMAIN_MEMBER.txt +++ b/docs/textdocs/DOMAIN_MEMBER.txt @@ -1,3 +1,6 @@ +!== +!== DOMAIN_MEMBER.txt for Samba release 2.0.1 07 Feb 1999 +!== TITLE INFORMATION: Joining an NT Domain with Samba 2.0 AUTHOR INFORMATION: Jeremy Allison, Samba Team diff --git a/docs/textdocs/ENCRYPTION.txt b/docs/textdocs/ENCRYPTION.txt index bbafc1950e3..beba5bfbc72 100644 --- a/docs/textdocs/ENCRYPTION.txt +++ b/docs/textdocs/ENCRYPTION.txt @@ -1,5 +1,5 @@ !== -!== ENCRYPTION.txt for Samba release 2.0.0 15 Jan 1999 +!== ENCRYPTION.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Jeremy Allison <samba-bugs@samba.org> Updated: March 19, 1998 diff --git a/docs/textdocs/Faxing.txt b/docs/textdocs/Faxing.txt index 85b962bf3b3..be0dbb3f645 100644 --- a/docs/textdocs/Faxing.txt +++ b/docs/textdocs/Faxing.txt @@ -1,5 +1,5 @@ !== -!== Faxing.txt for Samba release 2.0.0 15 Jan 1999 +!== Faxing.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Gerhard Zuber <zuber@berlin.snafu.de> Date: August 5th 1997. diff --git a/docs/textdocs/GOTCHAS.txt b/docs/textdocs/GOTCHAS.txt index 99415aa4d4e..daf48f0c7ea 100644 --- a/docs/textdocs/GOTCHAS.txt +++ b/docs/textdocs/GOTCHAS.txt @@ -1,5 +1,5 @@ !== -!== GOTCHAS.txt for Samba release 2.0.0 15 Jan 1999 +!== GOTCHAS.txt for Samba release 2.0.1 07 Feb 1999 !== This file lists Gotchas to watch out for: ========================================================================= diff --git a/docs/textdocs/HINTS.txt b/docs/textdocs/HINTS.txt index aa425c16e3a..ca70566e975 100644 --- a/docs/textdocs/HINTS.txt +++ b/docs/textdocs/HINTS.txt @@ -1,5 +1,5 @@ !== -!== HINTS.txt for Samba release 2.0.0 15 Jan 1999 +!== HINTS.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Many Updated: Not for a long time! diff --git a/docs/textdocs/MIRRORS.txt b/docs/textdocs/MIRRORS.txt index 1f107a72689..14a6521ab1b 100755 --- a/docs/textdocs/MIRRORS.txt +++ b/docs/textdocs/MIRRORS.txt @@ -1,5 +1,5 @@ !== -!== MIRRORS.txt for Samba release 2.0.0 15 Jan 1999 +!== MIRRORS.txt for Samba release 2.0.1 07 Feb 1999 !== For a list of web and ftp mirrors please see diff --git a/docs/textdocs/Macintosh_Clients.txt b/docs/textdocs/Macintosh_Clients.txt index 10bccf14dd3..1417a09f44a 100644 --- a/docs/textdocs/Macintosh_Clients.txt +++ b/docs/textdocs/Macintosh_Clients.txt @@ -1,5 +1,5 @@ !== -!== Macintosh_Clients.txt for Samba release 2.0.0 15 Jan 1999 +!== Macintosh_Clients.txt for Samba release 2.0.1 07 Feb 1999 !== > Are there any Macintosh clients for Samba? diff --git a/docs/textdocs/NTDOMAIN.txt b/docs/textdocs/NTDOMAIN.txt index 7670136d323..ab4828660b6 100644 --- a/docs/textdocs/NTDOMAIN.txt +++ b/docs/textdocs/NTDOMAIN.txt @@ -1,5 +1,5 @@ !== -!== NTDOMAIN.txt for Samba release 2.0.0 15 Jan 1999 +!== NTDOMAIN.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Luke Kenneth Casson Leighton (samba-bugs@samba.org) Copyright (C) 1997 Luke Kenneth Casson Leighton diff --git a/docs/textdocs/NetBIOS.txt b/docs/textdocs/NetBIOS.txt index 2d67d144d4b..ad96def81ec 100644 --- a/docs/textdocs/NetBIOS.txt +++ b/docs/textdocs/NetBIOS.txt @@ -1,5 +1,5 @@ !== -!== NetBIOS.txt for Samba release 2.0.0 15 Jan 1999 +!== NetBIOS.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: lkcl - samba-bugs@arvidsjaur.anu.edu.au Copyright 1997 Luke Kenneth Casson Leighton diff --git a/docs/textdocs/OS2-Client-HOWTO.txt b/docs/textdocs/OS2-Client-HOWTO.txt index f9839499802..cbde76986b6 100644 --- a/docs/textdocs/OS2-Client-HOWTO.txt +++ b/docs/textdocs/OS2-Client-HOWTO.txt @@ -1,5 +1,5 @@ !== -!== OS2-Client-HOWTO.txt for Samba release 2.0.0 15 Jan 1999 +!== OS2-Client-HOWTO.txt for Samba release 2.0.1 07 Feb 1999 !== diff --git a/docs/textdocs/PRINTER_DRIVER.txt b/docs/textdocs/PRINTER_DRIVER.txt index 9d68f74fd2e..2438d9aae97 100644 --- a/docs/textdocs/PRINTER_DRIVER.txt +++ b/docs/textdocs/PRINTER_DRIVER.txt @@ -1,5 +1,5 @@ !== -!== PRINTER_DRIVER.txt for Samba release 2.0.0 15 Jan 1999 +!== PRINTER_DRIVER.txt for Samba release 2.0.1 07 Feb 1999 !== ========================================================================== Supporting the famous PRINTER$ share diff --git a/docs/textdocs/PROFILES.txt b/docs/textdocs/PROFILES.txt index d7b41f7d941..bb685b8a236 100644 --- a/docs/textdocs/PROFILES.txt +++ b/docs/textdocs/PROFILES.txt @@ -1,5 +1,5 @@ !== -!== PROFILES.txt for Samba release 2.0.0 15 Jan 1999 +!== PROFILES.txt for Samba release 2.0.1 07 Feb 1999 !== Contributors: Bruce Cook <BC3-AU@bigfoot.com> Copyright (C) 1998 Bruce Cook diff --git a/docs/textdocs/Passwords.txt b/docs/textdocs/Passwords.txt index 8611acc404a..2e6a68ed29c 100644 --- a/docs/textdocs/Passwords.txt +++ b/docs/textdocs/Passwords.txt @@ -1,5 +1,5 @@ !== -!== Passwords.txt for Samba release 2.0.0 15 Jan 1999 +!== Passwords.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Unknown Date: Unknown diff --git a/docs/textdocs/Printing.txt b/docs/textdocs/Printing.txt index d91417c7470..5e502b2db1e 100644 --- a/docs/textdocs/Printing.txt +++ b/docs/textdocs/Printing.txt @@ -1,5 +1,5 @@ !== -!== Printing.txt for Samba release 2.0.0 15 Jan 1999 +!== Printing.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Unknown <samba-bugs@samba.org> Date: Unknown diff --git a/docs/textdocs/Recent-FAQs.txt b/docs/textdocs/Recent-FAQs.txt index 34f9f76f937..0d39ff7a79e 100644 --- a/docs/textdocs/Recent-FAQs.txt +++ b/docs/textdocs/Recent-FAQs.txt @@ -1,5 +1,5 @@ !== -!== Recent-FAQs.txt for Samba release 2.0.0 15 Jan 1999 +!== Recent-FAQs.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Samba-bugs@samba.org Date: July 5, 1998 diff --git a/docs/textdocs/RoutedNetworks.txt b/docs/textdocs/RoutedNetworks.txt index b6a4e07acae..bf622f9fed7 100644 --- a/docs/textdocs/RoutedNetworks.txt +++ b/docs/textdocs/RoutedNetworks.txt @@ -1,5 +1,5 @@ !== -!== RoutedNetworks.txt for Samba release 2.0.0 15 Jan 1999 +!== RoutedNetworks.txt for Samba release 2.0.1 07 Feb 1999 !== #NOFNR Flag in LMHosts to Communicate Across Routers
diff --git a/docs/textdocs/SCO.txt b/docs/textdocs/SCO.txt index d953cd7538f..589982d278f 100644 --- a/docs/textdocs/SCO.txt +++ b/docs/textdocs/SCO.txt @@ -1,5 +1,5 @@ !== -!== SCO.txt for Samba release 2.0.0 15 Jan 1999 +!== SCO.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Geza Makay <makayg@math.u-szeged.hu> Date: Unknown diff --git a/docs/textdocs/SSLeay.txt b/docs/textdocs/SSLeay.txt index a858458e657..8bb12b1d47e 100644 --- a/docs/textdocs/SSLeay.txt +++ b/docs/textdocs/SSLeay.txt @@ -1,5 +1,5 @@ !== -!== SSLeay.txt for Samba release 2.0.0 15 Jan 1999 +!== SSLeay.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Christian Starkjohann <cs@obdev.at> Date: May 29, 1998 diff --git a/docs/textdocs/Speed.txt b/docs/textdocs/Speed.txt index 625e23d9ad7..303f2f0cd64 100644 --- a/docs/textdocs/Speed.txt +++ b/docs/textdocs/Speed.txt @@ -1,5 +1,5 @@ !== -!== Speed.txt for Samba release 2.0.0 15 Jan 1999 +!== Speed.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Andrew Tridgell Date: January 1995 diff --git a/docs/textdocs/Speed2.txt b/docs/textdocs/Speed2.txt index 1cf44a32683..251ffa1c3d4 100644 --- a/docs/textdocs/Speed2.txt +++ b/docs/textdocs/Speed2.txt @@ -1,5 +1,5 @@ !== -!== Speed2.txt for Samba release 2.0.0 15 Jan 1999 +!== Speed2.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Paul Cochrane <paulc@dth.scot.nhs.uk> Organization: Dundee Limb Fitting Centre diff --git a/docs/textdocs/Support.txt b/docs/textdocs/Support.txt index a077d45ad72..54448a668a0 100644 --- a/docs/textdocs/Support.txt +++ b/docs/textdocs/Support.txt @@ -1,5 +1,5 @@ !== -!== Support.txt for Samba release 2.0.0 15 Jan 1999 +!== Support.txt for Samba release 2.0.1 07 Feb 1999 !== The Samba Consultants List ========================== diff --git a/docs/textdocs/Tracing.txt b/docs/textdocs/Tracing.txt index 3db7deda082..36b3f421ac5 100644 --- a/docs/textdocs/Tracing.txt +++ b/docs/textdocs/Tracing.txt @@ -1,5 +1,5 @@ !== -!== Tracing.txt for Samba release 2.0.0 15 Jan 1999 +!== Tracing.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Andrew Tridgell <samba-bugs@samba.org> Date: Old diff --git a/docs/textdocs/UNIX-SMB.txt b/docs/textdocs/UNIX-SMB.txt index 38792fa8dca..bdf3f5f3779 100644 --- a/docs/textdocs/UNIX-SMB.txt +++ b/docs/textdocs/UNIX-SMB.txt @@ -1,5 +1,5 @@ !== -!== UNIX-SMB.txt for Samba release 2.0.0 15 Jan 1999 +!== UNIX-SMB.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Andrew Tridgell <samba-bugs@samba.org> Date: April 1995 diff --git a/docs/textdocs/UNIX_INSTALL.txt b/docs/textdocs/UNIX_INSTALL.txt index 9704a79f8cf..6c514feee73 100644 --- a/docs/textdocs/UNIX_INSTALL.txt +++ b/docs/textdocs/UNIX_INSTALL.txt @@ -1,5 +1,5 @@ !== -!== UNIX_INSTALL.txt for Samba release 2.0.0 15 Jan 1999 +!== UNIX_INSTALL.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Andrew Tridgell <samba-bugs@samba.org> Date: Unknown diff --git a/docs/textdocs/UNIX_SECURITY.txt b/docs/textdocs/UNIX_SECURITY.txt index c3423b6d3d9..4081d414c34 100644 --- a/docs/textdocs/UNIX_SECURITY.txt +++ b/docs/textdocs/UNIX_SECURITY.txt @@ -1,5 +1,5 @@ !== -!== UNIX_SECURITY.txt for Samba release 2.0.0 15 Jan 1999 +!== UNIX_SECURITY.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: John H Terpstra <jht@samba.org> Date: July 5, 1998 diff --git a/docs/textdocs/Win95.txt b/docs/textdocs/Win95.txt index 0fa87ef3f5a..2bb1adb2ddb 100644 --- a/docs/textdocs/Win95.txt +++ b/docs/textdocs/Win95.txt @@ -1,5 +1,5 @@ !== -!== Win95.txt for Samba release 2.0.0 15 Jan 1999 +!== Win95.txt for Samba release 2.0.1 07 Feb 1999 !== Copyright (C) 1997 - Samba-Team Contributed Date: August 20, 1997 diff --git a/docs/textdocs/WinNT.txt b/docs/textdocs/WinNT.txt index d3a45e18b22..1ca0b55d6fa 100644 --- a/docs/textdocs/WinNT.txt +++ b/docs/textdocs/WinNT.txt @@ -1,5 +1,5 @@ !== -!== WinNT.txt for Samba release 2.0.0 15 Jan 1999 +!== WinNT.txt for Samba release 2.0.1 07 Feb 1999 !== Contributors: Various Password Section - Copyright (C) 1997 - John H Terpstra diff --git a/docs/textdocs/cifsntdomain.txt b/docs/textdocs/cifsntdomain.txt index c77a7412f21..11bc2155908 100644 --- a/docs/textdocs/cifsntdomain.txt +++ b/docs/textdocs/cifsntdomain.txt @@ -1,5 +1,5 @@ !== -!== cifsntdomain.txt for Samba release 2.0.0 15 Jan 1999 +!== cifsntdomain.txt for Samba release 2.0.1 07 Feb 1999 !== NT Domain Authentication ------------------------ diff --git a/docs/textdocs/security_level.txt b/docs/textdocs/security_level.txt index 10d1014263f..3e37e0f6208 100644 --- a/docs/textdocs/security_level.txt +++ b/docs/textdocs/security_level.txt @@ -1,5 +1,5 @@ !== -!== security_level.txt for Samba release 2.0.0 15 Jan 1999 +!== security_level.txt for Samba release 2.0.1 07 Feb 1999 !== Contributor: Andrew Tridgell Updated: June 27, 1997 diff --git a/docs/yodldocs/smb.conf.5.yo b/docs/yodldocs/smb.conf.5.yo index b2f3f787a25..6313a8a4ec7 100644 --- a/docs/yodldocs/smb.conf.5.yo +++ b/docs/yodldocs/smb.conf.5.yo @@ -1152,11 +1152,16 @@ should not use this parameter for machines that are serving PPP or other intermittent or non-broadcast network interfaces as it will not cope with non-permanent interfaces. -In addition, to change a users SMB password, the -url(bf(smbpasswd))(smbpasswd.8.html) by default connects to the -em("localhost" - 127.0.0.1) address as an SMB client to issue the -password change request. If bf("bind interfaces only") is set then -unless the network address em(127.0.0.1) is added to the +If bf("bind interfaces only") is set then unless the network address +em(127.0.0.1) is added to the link(bf('interfaces'))(interfaces) parameter +list url(bf(smbpasswd))(smbpasswd.8.html) and +url(bf(swat))(swat.8.html) may not work as expected due to the +reasons covered below. + +To change a users SMB password, the url(bf(smbpasswd))(smbpasswd.8.html) +by default connects to the em("localhost" - 127.0.0.1) address as an SMB +client to issue the password change request. If bf("bind interfaces only") +is set then unless the network address em(127.0.0.1) is added to the link(bf('interfaces'))(interfaces) parameter list then url(bf(smbpasswd))(smbpasswd.8.html) will fail to connect in it's default mode. url(bf(smbpasswd))(smbpasswd.8.html) can be forced to @@ -1165,6 +1170,14 @@ url(bf("-r remote machine"))(smbpasswd.8.html#minusr) parameter, with bf("remote machine") set to the IP name of the primary interface of the local host. +The url(bf(swat))(swat.8.html) status page tries to connect with +url(bf(smbd))(smbd.8.html) and url(bf(nmbd))(nmbd.8.html) at the address +em(127.0.0.1) to determine if they are running. Not adding em(127.0.0.1) will cause +url(bf(smbd))(smbd.8.html) and url(bf(nmbd))(nmbd.8.html) to always show +"not running" even if they really are. This can prevent +url(bf(swat))(swat.8.html) from starting/stopping/restarting +url(bf(smbd))(smbd.8.html) and url(bf(nmbd))(nmbd.8.html). + bf(Default:) tt( bind interfaces only = False) diff --git a/packaging/Caldera/makefile-path.patch b/packaging/Caldera/makefile-path.patch index 37cf817d0de..88d5222e09a 100644 --- a/packaging/Caldera/makefile-path.patch +++ b/packaging/Caldera/makefile-path.patch @@ -1,5 +1,5 @@ ---- samba-2.0.0/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 -+++ samba-2.0.0/source/Makefile.in Wed Dec 2 17:11:33 1998 +--- samba-2.0.1/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 ++++ samba-2.0.1/source/Makefile.in Wed Dec 2 17:11:33 1998 @@ -25,9 +25,9 @@ BINDIR = @bindir@ # we don't use sbindir because we want full compatibility with @@ -10,25 +10,3 @@ -VARDIR = @localstatedir@ +VARDIR = /var/log/samba MANDIR = @mandir@ - - # The permissions to give the executables -@@ -43,16 +43,16 @@ - DRIVERFILE = $(LIBDIR)/printers.def - PASSWD_PROGRAM = /bin/passwd - # This is where smbpasswd et al go --PRIVATEDIR = @privatedir@ -+PRIVATEDIR = $(LIBDIR) - - SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd - SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp - - # This is where SWAT images and help files go --SWATDIR = @swatdir@ -+SWATDIR = /usr/share/swat - - # the directory where lock files go --LOCKDIR = $(VARDIR)/locks -+LOCKDIR = /var/lock/samba - - # The directory where code page definition files go - CODEPAGEDIR = $(LIBDIR)/codepages diff --git a/packaging/Caldera/samba2.spec.tmpl b/packaging/Caldera/samba2.spec.tmpl index 84fe3dcd3b0..c8e53e08524 100644 --- a/packaging/Caldera/samba2.spec.tmpl +++ b/packaging/Caldera/samba2.spec.tmpl @@ -42,7 +42,7 @@ docs directory for implementation details. %build cd source -./configure --prefix=/usr --libdir=/etc +./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat make all %install diff --git a/packaging/PHT/TurboLinux/makefile-path.patch b/packaging/PHT/TurboLinux/makefile-path.patch index 37cf817d0de..88d5222e09a 100644 --- a/packaging/PHT/TurboLinux/makefile-path.patch +++ b/packaging/PHT/TurboLinux/makefile-path.patch @@ -1,5 +1,5 @@ ---- samba-2.0.0/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 -+++ samba-2.0.0/source/Makefile.in Wed Dec 2 17:11:33 1998 +--- samba-2.0.1/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 ++++ samba-2.0.1/source/Makefile.in Wed Dec 2 17:11:33 1998 @@ -25,9 +25,9 @@ BINDIR = @bindir@ # we don't use sbindir because we want full compatibility with @@ -10,25 +10,3 @@ -VARDIR = @localstatedir@ +VARDIR = /var/log/samba MANDIR = @mandir@ - - # The permissions to give the executables -@@ -43,16 +43,16 @@ - DRIVERFILE = $(LIBDIR)/printers.def - PASSWD_PROGRAM = /bin/passwd - # This is where smbpasswd et al go --PRIVATEDIR = @privatedir@ -+PRIVATEDIR = $(LIBDIR) - - SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd - SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp - - # This is where SWAT images and help files go --SWATDIR = @swatdir@ -+SWATDIR = /usr/share/swat - - # the directory where lock files go --LOCKDIR = $(VARDIR)/locks -+LOCKDIR = /var/lock/samba - - # The directory where code page definition files go - CODEPAGEDIR = $(LIBDIR)/codepages diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl index 1c9a3e4158d..06db95a69d5 100644 --- a/packaging/PHT/TurboLinux/samba2.spec.tmpl +++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl @@ -96,7 +96,7 @@ enabled. PHT TurboLinux has built in support for quotas in PAM. %build cd source -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/etc --with-smbwrapper --with-automount --with-quotas +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat --with-smbwrapper --with-automount --with-quotas make all smbwrapper %install diff --git a/packaging/RedHat/makefile-path.patch b/packaging/RedHat/makefile-path.patch index 37cf817d0de..88d5222e09a 100644 --- a/packaging/RedHat/makefile-path.patch +++ b/packaging/RedHat/makefile-path.patch @@ -1,5 +1,5 @@ ---- samba-2.0.0/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 -+++ samba-2.0.0/source/Makefile.in Wed Dec 2 17:11:33 1998 +--- samba-2.0.1/source/Makefile.in.orig Tue Dec 1 22:32:20 1998 ++++ samba-2.0.1/source/Makefile.in Wed Dec 2 17:11:33 1998 @@ -25,9 +25,9 @@ BINDIR = @bindir@ # we don't use sbindir because we want full compatibility with @@ -10,25 +10,3 @@ -VARDIR = @localstatedir@ +VARDIR = /var/log/samba MANDIR = @mandir@ - - # The permissions to give the executables -@@ -43,16 +43,16 @@ - DRIVERFILE = $(LIBDIR)/printers.def - PASSWD_PROGRAM = /bin/passwd - # This is where smbpasswd et al go --PRIVATEDIR = @privatedir@ -+PRIVATEDIR = $(LIBDIR) - - SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd - SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp - - # This is where SWAT images and help files go --SWATDIR = @swatdir@ -+SWATDIR = /usr/share/swat - - # the directory where lock files go --LOCKDIR = $(VARDIR)/locks -+LOCKDIR = /var/lock/samba - - # The directory where code page definition files go - CODEPAGEDIR = $(LIBDIR)/codepages diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl index d4e0133ccfd..211e04973a3 100644 --- a/packaging/RedHat/samba2.spec.tmpl +++ b/packaging/RedHat/samba2.spec.tmpl @@ -97,7 +97,7 @@ enabled. Red Hat Linux has built in support for quotas in PAM. %build cd source -./configure --prefix=/usr --libdir=/etc --with-smbwrapper --with-automount --with-quotas +./configure --prefix=/usr --libdir=/etc --with-lockdir=/var/lock/samba --with-privatedir=/etc --with-swatdir=/usr/share/swat --with-smbwrapper --with-automount --with-quotas make all smbwrapper %install diff --git a/source/include/local.h b/source/include/local.h index 92288a20b80..e81a8d4dbf0 100644 --- a/source/include/local.h +++ b/source/include/local.h @@ -32,7 +32,7 @@ /* max number of directories open at once */ /* note that with the new directory code this no longer requires a file handle per directory, but large numbers do use more memory */ -#define MAX_OPEN_DIRECTORIES 64 +#define MAX_OPEN_DIRECTORIES 256 /* max number of directory handles */ /* As this now uses the bitmap code this can be diff --git a/source/include/version.h b/source/include/version.h index 082fe6a5e99..7f364e8321c 100644 --- a/source/include/version.h +++ b/source/include/version.h @@ -1 +1 @@ -#define VERSION "2.0.0" +#define VERSION "2.0.1" diff --git a/source/lib/smbrun.c b/source/lib/smbrun.c index 7162b9266ae..366657129de 100644 --- a/source/lib/smbrun.c +++ b/source/lib/smbrun.c @@ -115,9 +115,17 @@ int smbrun(char *cmd,char *outfile,BOOL shared) #else /* in this newer method we will exec /bin/sh with the correct arguments, after first setting stdout to point at the file */ - + + /* + * We need to temporarily stop CatchChild from eating + * SIGCLD signals as it also eats the exit status code. JRA. + */ + + CatchChildLeaveStatus(); + if ((pid=fork()) < 0) { DEBUG(0,("smbrun: fork failed with error %s\n", strerror(errno) )); + CatchChild(); return errno; } @@ -128,13 +136,18 @@ int smbrun(char *cmd,char *outfile,BOOL shared) int status=0; pid_t wpid; + /* the parent just waits for the child to exit */ while((wpid = sys_waitpid(pid,&status,0)) < 0) { if(errno == EINTR) { errno = 0; continue; } + break; } + + CatchChild(); + if (wpid != pid) { DEBUG(2,("waitpid(%d) : %s\n",pid,strerror(errno))); return -1; @@ -142,6 +155,7 @@ int smbrun(char *cmd,char *outfile,BOOL shared) return status; } + CatchChild(); /* we are in the child. we exec /bin/sh to do the work for us. we don't directly exec the command we want because it may be a diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c index 6d395659c92..ac3b2f459b8 100644 --- a/source/lib/util_sock.c +++ b/source/lib/util_sock.c @@ -373,6 +373,7 @@ ssize_t read_data(int fd,char *buffer,size_t N) } if (ret == -1) { + DEBUG(0,("read_data: read failure. Error = %s\n", strerror(errno) )); smb_read_error = READ_ERROR; return -1; } @@ -402,7 +403,10 @@ ssize_t write_data(int fd,char *buffer,size_t N) ret = write(fd,buffer + total,N - total); #endif /* WITH_SSL */ - if (ret == -1) return -1; + if (ret == -1) { + DEBUG(0,("write_data: write failure. Error = %s\n", strerror(errno) )); + return -1; + } if (ret == 0) return total; total += ret; diff --git a/source/smbd/chgpasswd.c b/source/smbd/chgpasswd.c index bdc7cb11592..8ba9b1e01ab 100644 --- a/source/smbd/chgpasswd.c +++ b/source/smbd/chgpasswd.c @@ -323,6 +323,7 @@ static BOOL chat_with_program(char *passwordprogram,char *name,char *chatsequenc errno = 0; continue; } + break; } if (wpid < 0) { diff --git a/source/smbd/dir.c b/source/smbd/dir.c index 096b3195761..f4d25170081 100644 --- a/source/smbd/dir.c +++ b/source/smbd/dir.c @@ -114,13 +114,13 @@ static void dptr_idleoldest(void) Get the dptr_struct for a dir index. ****************************************************************************/ -static dptr_struct *dptr_get(int key) +static dptr_struct *dptr_get(int key, BOOL forclose) { dptr_struct *dptr; for(dptr = dirptrs; dptr; dptr = dptr->next) { if(dptr->dnum == key) { - if (!dptr->ptr) { + if (!forclose && !dptr->ptr) { if (dptrs_open >= MAX_OPEN_DIRECTORIES) dptr_idleoldest(); DEBUG(4,("Reopening dptr key %d\n",key)); @@ -140,7 +140,7 @@ static dptr_struct *dptr_get(int key) static void *dptr_ptr(int key) { - dptr_struct *dptr = dptr_get(key); + dptr_struct *dptr = dptr_get(key, False); if (dptr) return(dptr->ptr); @@ -153,7 +153,7 @@ static void *dptr_ptr(int key) char *dptr_path(int key) { - dptr_struct *dptr = dptr_get(key); + dptr_struct *dptr = dptr_get(key, False); if (dptr) return(dptr->path); @@ -166,7 +166,7 @@ char *dptr_path(int key) char *dptr_wcard(int key) { - dptr_struct *dptr = dptr_get(key); + dptr_struct *dptr = dptr_get(key, False); if (dptr) return(dptr->wcard); @@ -180,7 +180,7 @@ char *dptr_wcard(int key) BOOL dptr_set_wcard(int key, char *wcard) { - dptr_struct *dptr = dptr_get(key); + dptr_struct *dptr = dptr_get(key, False); if (dptr) { dptr->wcard = wcard; @@ -196,7 +196,7 @@ BOOL dptr_set_wcard(int key, char *wcard) BOOL dptr_set_attr(int key, uint16 attr) { - dptr_struct *dptr = dptr_get(key); + dptr_struct *dptr = dptr_get(key, False); if (dptr) { dptr->attr = attr; @@ -211,7 +211,7 @@ BOOL dptr_set_attr(int key, uint16 attr) uint16 dptr_attr(int key) { - dptr_struct *dptr = dptr_get(key); + dptr_struct *dptr = dptr_get(key, False); if (dptr) return(dptr->attr); @@ -233,6 +233,11 @@ static void dptr_close_internal(dptr_struct *dptr) * biased by one with respect to the bitmap. */ + if(bitmap_query( dptr_bmap, dptr->dnum - 1) != True) { + DEBUG(0,("dptr_close_internal : Error - closing dnum = %d and bitmap not set !\n", + dptr->dnum )); + } + bitmap_clear(dptr_bmap, dptr->dnum - 1); if (dptr->ptr) { @@ -269,7 +274,7 @@ void dptr_close(int *key) return; } - dptr = dptr_get(*key); + dptr = dptr_get(*key, True); if (!dptr) { DEBUG(0,("Invalid key %d given to dptr_close\n", *key)); @@ -430,7 +435,7 @@ int dptr_create(connection_struct *conn,char *path, BOOL old_handle, BOOL expect dptr->dnum = bitmap_find(dptr_bmap, 0); if(dptr->dnum == -1 || dptr->dnum > 254) { - DEBUG(0,("dptr_create: Error - all old style dirptrs in use ?\n")); + DEBUG(0,("dptr_create: returned %d: Error - all old dirptrs in use ?\n", dptr->dnum)); free((char *)dptr); return -1; } @@ -444,8 +449,8 @@ int dptr_create(connection_struct *conn,char *path, BOOL old_handle, BOOL expect dptr->dnum = bitmap_find(dptr_bmap, 255); - if(dptr->dnum == -1) { - DEBUG(0,("dptr_create: Error - all dirptrs in use ?\n")); + if(dptr->dnum == -1 || dptr->dnum < 255) { + DEBUG(0,("dptr_create: returned %d: Error - all new dirptrs in use ?\n", dptr->dnum)); free((char *)dptr); return -1; } diff --git a/source/tests/crypttest.c b/source/tests/crypttest.c index 183ed06394e..c9133f40bee 100644 --- a/source/tests/crypttest.c +++ b/source/tests/crypttest.c @@ -1,4 +1,7 @@ +#if defined(HAVE_UNISTD_H) #include <unistd.h> +#endif + #include <sys/types.h> #ifdef HAVE_STRING_H diff --git a/source/tests/fcntl_lock.c b/source/tests/fcntl_lock.c index a90e00aa000..e0eee4a12ee 100644 --- a/source/tests/fcntl_lock.c +++ b/source/tests/fcntl_lock.c @@ -1,5 +1,9 @@ /* test whether fcntl locking works on this system */ +#if defined(HAVE_UNISTD_H) +#include <unistd.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <sys/types.h> diff --git a/source/tests/ftruncate.c b/source/tests/ftruncate.c index 8d5e8942e37..93282782eed 100644 --- a/source/tests/ftruncate.c +++ b/source/tests/ftruncate.c @@ -1,6 +1,9 @@ /* test whether ftruncte() can extend a file */ +#if defined(HAVE_UNISTD_H) #include <unistd.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/source/tests/ftruncroot.c b/source/tests/ftruncroot.c index ce3bbbd92c1..36a4adc19df 100644 --- a/source/tests/ftruncroot.c +++ b/source/tests/ftruncroot.c @@ -1,6 +1,9 @@ /* test whether ftruncte() can truncate a file as non-root */ +#if defined(HAVE_UNISTD_H) #include <unistd.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> diff --git a/source/tests/getgroups.c b/source/tests/getgroups.c index 37990e010b8..343fd5a184f 100644 --- a/source/tests/getgroups.c +++ b/source/tests/getgroups.c @@ -7,6 +7,10 @@ array of ints! Ultrix is one culprit */ +#if defined(HAVE_UNISTD_H) +#include <unistd.h> +#endif + #include <sys/types.h> #include <stdio.h> #include <unistd.h> diff --git a/source/tests/shared_mmap.c b/source/tests/shared_mmap.c index fb8a2a32d5f..c0b34e19579 100644 --- a/source/tests/shared_mmap.c +++ b/source/tests/shared_mmap.c @@ -1,7 +1,9 @@ /* this tests whether we can use a shared writeable mmap on a file - as needed for the mmap varient of FAST_SHARE_MODES */ +#if defined(HAVE_UNISTD_H) #include <unistd.h> +#endif #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/source/tests/summary.c b/source/tests/summary.c index 3db510495ae..6a3d67132fd 100644 --- a/source/tests/summary.c +++ b/source/tests/summary.c @@ -2,7 +2,7 @@ main() { -#ifndef HAVE_FCNTL_LOCK +#if !(defined(HAVE_FCNTL_LOCK) || defined(HAVE_STRUCT_FLOCK64)) printf("ERROR: No locking available. Running Samba would be unsafe\n"); exit(1); #endif diff --git a/source/tests/sysv_ipc.c b/source/tests/sysv_ipc.c index 13956ec6f08..9f0e20957a2 100644 --- a/source/tests/sysv_ipc.c +++ b/source/tests/sysv_ipc.c @@ -1,7 +1,9 @@ /* this tests whether we can use a sysv shared memory segment as needed for the sysv varient of FAST_SHARE_MODES */ +#if defined(HAVE_UNISTD_H) #include <unistd.h> +#endif #include <sys/types.h> #include <sys/stat.h> #include <sys/ipc.h> diff --git a/source/tests/trapdoor.c b/source/tests/trapdoor.c index e6caf982abf..4696122ef8f 100644 --- a/source/tests/trapdoor.c +++ b/source/tests/trapdoor.c @@ -1,7 +1,9 @@ /* test for a trapdoor uid system */ -#include <stdlib.h> +#if defined(HAVE_UNISTD_H) #include <unistd.h> +#endif +#include <stdlib.h> #include <stdio.h> main() |