From: Andrew Tridgell Date: Sat, 23 Jun 2001 06:13:00 +0000 (+0000) Subject: updated 2_0_release tree with 2.0.8 changes X-Git-Tag: samba-2.0.8~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9905ecbe98fdcb5cdddd70dda43afdc13b09c8b;p=thirdparty%2Fsamba.git updated 2_0_release tree with 2.0.8 changes --- diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 432ce03a7fa..af19a014802 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,29 @@ - WHATS NEW IN Samba 2.0.7 + WHATS NEW IN Samba 2.0.8 ======================== +Samba 2.0.8 is a security bugfix release. Previous versions of Samba +had a bug with the handling of temporary files that allows local users +to destroy data on local devices. This bug was discovered during a +routine security audit by Caldera. While no exploitation of this bug +is known to have occurred it is fairly easy to exploit so sites with +untrusted local users should take the threat seriously. + +The only changes in 2.0.8 are the security updates. This is to +maximise stability for those sites that cannot afford to risk any +other sort of update. For most sites the Samba Team recommends that +the new 2.2.x version of Samba be used instead, as that provides not +only the security fixes but much greater functionality and many more +bug fixes. + + +Samba Team +April 2001 + + + +Previous release notes from 2.0.7 +--------------------------------- + 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. diff --git a/docs/htmldocs/smbspool.8.html b/docs/htmldocs/smbspool.8.html index f531c9b48ff..53c0f8306f7 100644 --- a/docs/htmldocs/smbspool.8.html +++ b/docs/htmldocs/smbspool.8.html @@ -3,6 +3,7 @@ + smbspool (1) @@ -15,73 +16,73 @@

Samba

11 October 1999

- -


+

+

NAME

- smbspool - send print file to an SMB printer -


+ smbspool - mount an SMB filesystem +

SYNOPSIS

smbspool job user title copies options [filename] -


+

DESCRIPTION

-


This program is part of the Samba suite. -


smbspool is a very small print spooling program that sends a print -file to an SMB printer. The command-line arguments are position-dependent for +

This program is part of the Samba suite. +

smbspool is a very small print spooling program that sends a print +file to a SMB printer. The command-line arguments are position-dependent for compatibility with the Common UNIX Printing System, but you can use smbspool with any printing system or from a program or script. -


DEVICE URI

+

DEVICE URI

-


smbspool specifies the destination using a Uniform Resource Identifier +

smbspool specifies the destination using a Uniform Resource Identifier ("URI") with a method of "smb". This string can take a number of forms: -


-


smbspool tries to get the URI from argv[0]. If argv[0] contains the +

  • smb://workgroup/server/printer +

  • smb://username:password@server/printer +

  • smb://username:password@workgroup/server/printer +

    +

    smbspool tries to get the URI from argv[0]. If argv[0] contains the name of the program then it looks in the DEVICE_URI environment variable. -


    Programs using the exec(2) functions can pass the URI in argv[0], +

    Programs using the exec(2) functions can pass the URI in argv[0], while shell scripts must set the DEVICE_URI environment variable prior to running smbspool. -


    OPTIONS

    +

    OPTIONS

    -


    The job argument (argv[1]) contains the job ID number and is presently +

    The job argument (argv[1]) contains the job ID number and is presently not used by smbspool. -


    The user argument (argv[2]) contains the print user's name and is +

    The user argument (argv[2]) contains the print user's name and is presently not used by smbspool. -


    The title argument (argv[3]) contains the job title string and is +

    The title argument (argv[3]) contains the job title string and is passed as the remote file name when sending the print job. -


    The copies argument (argv[4]) contains the number of copies to be +

    The copies argument (argv[4]) contains the number of copies to be printed of the named file. If no filename is provided than this argument is not used by smbspool. -


    The options argument (argv[5]) contains the print options in a single +

    The options argument (argv[5]) contains the print options in a single string and is presently not used by smbspool. -


    The filename argument (argv[6]) contains the name of the file to print. +

    The filename argument (argv[6]) contains the name of the file to print. If this argument is not specified then the print file is read from the standard input. -


    +

    VERSION

    -


    This man page is correct for version 2.0 of the Samba suite. -


    +

    This man page is correct for version 2\&.0 of the Samba suite\&. +

    SEE ALSO

    smbd (8) -


    +

    AUTHOR

    -


    smbspool was written by Michael Sweet at Easy Software Products. -


    The original Samba software and related utilities were created by +

    smbspool was written by Michael Sweet at Easy Software Products. +

    The original Samba software and related utilities were created by Andrew Tridgell samba@samba.org. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed. -


    See samba (7) to find out how to get a full +

    See samba (7) to find out how to get a full list of contributors and details on how to submit bug reports, comments etc. diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5 index 37d96ef35cc..26de6719a90 100644 --- a/docs/manpages/lmhosts.5 +++ b/docs/manpages/lmhosts.5 @@ -1,4 +1,4 @@ -.TH LMHOSTS 5 "26 Apr 2000" "lmhosts 2.0.7" +.TH LMHOSTS 5 "17 Apr 2001" "lmhosts 2.0.8" .PP .SH "NAME" lmhosts \- The Samba NetBIOS hosts file diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1 index ffacf2903ff..2ee4f488a38 100644 --- a/docs/manpages/make_smbcodepage.1 +++ b/docs/manpages/make_smbcodepage.1 @@ -1,4 +1,4 @@ -.TH MAKE_SMBCODEPAGE 1 "26 Apr 2000" "make_smbcodepage 2.0.7" +.TH MAKE_SMBCODEPAGE 1 "17 Apr 2001" "make_smbcodepage 2.0.8" .PP .SH "NAME" make_smbcodepage \- Construct a codepage file for Samba diff --git a/docs/manpages/make_unicodemap.1 b/docs/manpages/make_unicodemap.1 index 9319f9ba4e2..4bbb5b4aa01 100644 --- a/docs/manpages/make_unicodemap.1 +++ b/docs/manpages/make_unicodemap.1 @@ -1,4 +1,4 @@ -.TH MAKE_UNICODEMAP 1 "26 Apr 2000" "make_unicodemap 2.0.7" +.TH MAKE_UNICODEMAP 1 "17 Apr 2001" "make_unicodemap 2.0.8" .PP .SH "NAME" make_unicodemap \- Construct a unicode map file for Samba diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index 3475212806b..02e31b3bc7f 100644 --- a/docs/manpages/nmbd.8 +++ b/docs/manpages/nmbd.8 @@ -1,4 +1,4 @@ -.TH NMBD 8 "26 Apr 2000" "nmbd 2.0.7" +.TH NMBD 8 "17 Apr 2001" "nmbd 2.0.8" .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 487a2c93afc..edc82fb236b 100644 --- a/docs/manpages/nmblookup.1 +++ b/docs/manpages/nmblookup.1 @@ -1,4 +1,4 @@ -.TH NMBLOOKUP 1 "26 Apr 2000" "nmblookup 2.0.7" +.TH NMBLOOKUP 1 "17 Apr 2001" "nmblookup 2.0.8" .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 45ef0847685..57d4325a923 100644 --- a/docs/manpages/samba.7 +++ b/docs/manpages/samba.7 @@ -1,4 +1,4 @@ -.TH SAMBA 7 "26 Apr 2000" "samba 2.0.7" +.TH SAMBA 7 "17 Apr 2001" "samba 2.0.8" .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 84439f0b12c..343cb82245f 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -1,4 +1,4 @@ -.TH SMB.CONF 5 "26 Apr 2000" "smb.conf 2.0.7" +.TH SMB.CONF 5 "17 Apr 2001" "smb.conf 2.0.8" .PP .SH "NAME" smb\&.conf \- The configuration file for the Samba suite diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1 index 1d297e0018b..e5fa8775e87 100644 --- a/docs/manpages/smbclient.1 +++ b/docs/manpages/smbclient.1 @@ -1,4 +1,4 @@ -.TH SMBCLIENT 1 "26 Apr 2000" "smbclient 2.0.7" +.TH SMBCLIENT 1 "17 Apr 2001" "smbclient 2.0.8" .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 1bbc5f8564f..dd00a57589b 100644 --- a/docs/manpages/smbd.8 +++ b/docs/manpages/smbd.8 @@ -1,4 +1,4 @@ -.TH SMBD 8 "26 Apr 2000" "smbd 2.0.7" +.TH SMBD 8 "17 Apr 2001" "smbd 2.0.8" .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 3f9dc70d7eb..7f76126993e 100644 --- a/docs/manpages/smbmnt.8 +++ b/docs/manpages/smbmnt.8 @@ -1,4 +1,4 @@ -.TH SMBMNT 8 "26 Apr 2000" "smbmnt 2.0.7" +.TH SMBMNT 8 "17 Apr 2001" "smbmnt 2.0.8" .PP .SH "NAME" smbmnt \- helper utility for mounting SMB filesystems diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8 index 13b7fdb7c0a..6f7e88ef67f 100644 --- a/docs/manpages/smbmount.8 +++ b/docs/manpages/smbmount.8 @@ -1,4 +1,4 @@ -.TH SMBMOUNT 8 "26 Apr 2000" "smbmount 2.0.7" +.TH SMBMOUNT 8 "17 Apr 2001" "smbmount 2.0.8" .PP .SH "NAME" smbmount \- mount an SMB filesystem diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5 index 0fc50b22c64..684b597519e 100644 --- a/docs/manpages/smbpasswd.5 +++ b/docs/manpages/smbpasswd.5 @@ -1,4 +1,4 @@ -.TH SMBPASSWD 5 "26 Apr 2000" "smbpasswd 2.0.7" +.TH SMBPASSWD 5 "17 Apr 2001" "smbpasswd 2.0.8" .PP .SH "NAME" smbpasswd \- The Samba encrypted password file diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8 index d5a00bb4842..db22d547dd4 100644 --- a/docs/manpages/smbpasswd.8 +++ b/docs/manpages/smbpasswd.8 @@ -1,4 +1,4 @@ -.TH SMBPASSWD 8 "26 Apr 2000" "smbpasswd 2.0.7" +.TH SMBPASSWD 8 "17 Apr 2001" "smbpasswd 2.0.8" .PP .SH "NAME" smbpasswd \- change a users SMB password diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1 index 9cfc2a2c467..ba85a1ed206 100644 --- a/docs/manpages/smbrun.1 +++ b/docs/manpages/smbrun.1 @@ -1,4 +1,4 @@ -.TH SMBRUN 1 "26 Apr 2000" "smbrun 2.0.7" +.TH SMBRUN 1 "17 Apr 2001" "smbrun 2.0.8" .PP .SH "NAME" smbrun \- interface program between smbd and external programs diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1 index 44f6b063e39..2acedfb0eaf 100644 --- a/docs/manpages/smbsh.1 +++ b/docs/manpages/smbsh.1 @@ -1,4 +1,4 @@ -.TH SMBSH 1 "26 Apr 2000" "smbsh 2.0.7" +.TH SMBSH 1 "17 Apr 2001" "smbsh 2.0.8" .PP .SH "NAME" smbsh \- Allows access to Windows NT filesystem using UNIX commands diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8 index 053f11b5a08..f329eacba21 100644 --- a/docs/manpages/smbspool.8 +++ b/docs/manpages/smbspool.8 @@ -1,7 +1,8 @@ -.TH "smbspool " "1" "11 October 1999" "Samba" "SAMBA" +.TH SMBSPOOL 8 "17 Apr 2001" "smbspool 2.0.8" +.PP .PP .SH "NAME" -smbspool \- send print file to an SMB printer +smbspool \- mount an SMB filesystem .PP .SH "SYNOPSIS" \fBsmbspool\fP job user title copies options [filename] @@ -11,7 +12,7 @@ smbspool \- send print file to an SMB printer This program is part of the Samba suite\&. .PP smbspool is a very small print spooling program that sends a print -file to an SMB printer\&. The command-line arguments are position-dependent for +file to a SMB printer\&. The command-line arguments are position-dependent for compatibility with the Common UNIX Printing System, but you can use smbspool with any printing system or from a program or script\&. .PP @@ -65,7 +66,7 @@ standard input\&. .PP .SH "VERSION" .PP -This man page is correct for version 2\&.0 of the Samba suite\&. +This man page is correct for version 2\e&\&.0 of the Samba suite\e&\&. .PP .SH "SEE ALSO" \fBsmbd (8)\fP diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1 index 8f723a6bb93..026b6660a46 100644 --- a/docs/manpages/smbstatus.1 +++ b/docs/manpages/smbstatus.1 @@ -1,4 +1,4 @@ -.TH SMBSTATUS 1 "26 Apr 2000" "smbstatus 2.0.7" +.TH SMBSTATUS 1 "17 Apr 2001" "smbstatus 2.0.8" .PP .SH "NAME" smbstatus \- report on current Samba connections diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1 index 8a190ba2d99..600d787609b 100644 --- a/docs/manpages/smbtar.1 +++ b/docs/manpages/smbtar.1 @@ -1,4 +1,4 @@ -.TH SMBTAR 1 "26 Apr 2000" "smbtar 2.0.7" +.TH SMBTAR 1 "17 Apr 2001" "smbtar 2.0.8" .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 f61560b7207..ae4991f7224 100644 --- a/docs/manpages/smbumount.8 +++ b/docs/manpages/smbumount.8 @@ -1,4 +1,4 @@ -.TH SMBUMOUNT 8 "26 Apr 2000" "smbumount 2.0.7" +.TH SMBUMOUNT 8 "17 Apr 2001" "smbumount 2.0.8" .SH NAME smbumount \- umount for normal users .SH SYNOPSIS diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8 index e7e5f266715..e54ad49efd9 100644 --- a/docs/manpages/swat.8 +++ b/docs/manpages/swat.8 @@ -1,4 +1,4 @@ -.TH SWAT 8 "26 Apr 2000" "swat 2.0.7" +.TH SWAT 8 "17 Apr 2001" "swat 2.0.8" .PP .SH "NAME" swat \- Samba Web Administration Tool diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index dbc9c24bd59..c95d6f307ea 100644 --- a/docs/manpages/testparm.1 +++ b/docs/manpages/testparm.1 @@ -1,4 +1,4 @@ -.TH TESTPARM 1 "26 Apr 2000" "testparm 2.0.7" +.TH TESTPARM 1 "17 Apr 2001" "testparm 2.0.8" .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 ff2c8e919fc..82c6e229719 100644 --- a/docs/manpages/testprns.1 +++ b/docs/manpages/testprns.1 @@ -1,4 +1,4 @@ -.TH TESTPRNS 1 "26 Apr 2000" "testprns 2.0.7" +.TH TESTPRNS 1 "17 Apr 2001" "testprns 2.0.8" .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 5496328c616..88bdc4c057c 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.7 26 Apr 2000 +!== Application_Serving.txt for Samba release 2.0.8 17 Apr 2001 !== Contributed: January 7, 1997 Updated: March 24, 1998 diff --git a/docs/textdocs/BROWSING-Config.txt b/docs/textdocs/BROWSING-Config.txt index 32d6683cdf2..22a396c8f3b 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.7 26 Apr 2000 +!== BROWSING-Config.txt for Samba release 2.0.8 17 Apr 2001 !== Date: July 5, 1998 Contributor: John H Terpstra diff --git a/docs/textdocs/BROWSING.txt b/docs/textdocs/BROWSING.txt index 4ab9a80570f..f2c492cb4f0 100644 --- a/docs/textdocs/BROWSING.txt +++ b/docs/textdocs/BROWSING.txt @@ -1,5 +1,5 @@ !== -!== BROWSING.txt for Samba release 2.0.7 26 Apr 2000 +!== BROWSING.txt for Samba release 2.0.8 17 Apr 2001 !== 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 799df46d65a..e0255a91244 100644 --- a/docs/textdocs/BUGS.txt +++ b/docs/textdocs/BUGS.txt @@ -1,5 +1,5 @@ !== -!== BUGS.txt for Samba release 2.0.7 26 Apr 2000 +!== BUGS.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Samba Team Updated: June 27, 1997 diff --git a/docs/textdocs/CRLF-LF-Conversions.txt b/docs/textdocs/CRLF-LF-Conversions.txt index efb365f9bf9..b379a72f22e 100644 --- a/docs/textdocs/CRLF-LF-Conversions.txt +++ b/docs/textdocs/CRLF-LF-Conversions.txt @@ -1,5 +1,5 @@ !== -!== CRLF-LF-Conversions.txt for Samba release 2.0.7 26 Apr 2000 +!== CRLF-LF-Conversions.txt for Samba release 2.0.8 17 Apr 2001 !== We get many requests for CRLF/LF format conversion handling by samba. The problem is that there is no clean way to determine which files diff --git a/docs/textdocs/CVS_ACCESS.txt b/docs/textdocs/CVS_ACCESS.txt index 0bb22deb73f..275afb0dae9 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.7 26 Apr 2000 +!== CVS_ACCESS.txt for Samba release 2.0.8 17 Apr 2001 !== 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 2485161b02d..353894f307f 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.7 26 Apr 2000 +!== DHCP-Server-Configuration.txt for Samba release 2.0.8 17 Apr 2001 !== Subject: DHCP Server Configuration for SMB Clients Date: March 1, 1998 diff --git a/docs/textdocs/DIAGNOSIS.txt b/docs/textdocs/DIAGNOSIS.txt index e1916167c2d..96c979f447b 100644 --- a/docs/textdocs/DIAGNOSIS.txt +++ b/docs/textdocs/DIAGNOSIS.txt @@ -1,5 +1,5 @@ !== -!== DIAGNOSIS.txt for Samba release 2.0.7 26 Apr 2000 +!== DIAGNOSIS.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Andrew Tridgell Updated: November 1, 1999 diff --git a/docs/textdocs/DNIX.txt b/docs/textdocs/DNIX.txt index 28ef4ae0b0c..716a6f1476e 100644 --- a/docs/textdocs/DNIX.txt +++ b/docs/textdocs/DNIX.txt @@ -1,5 +1,5 @@ !== -!== DNIX.txt for Samba release 2.0.7 26 Apr 2000 +!== DNIX.txt for Samba release 2.0.8 17 Apr 2001 !== 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 7275800a965..99126602d9a 100644 --- a/docs/textdocs/DOMAIN.txt +++ b/docs/textdocs/DOMAIN.txt @@ -1,5 +1,5 @@ !== -!== DOMAIN.txt for Samba release 2.0.7 26 Apr 2000 +!== DOMAIN.txt for Samba release 2.0.8 17 Apr 2001 !== 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 24a002fac67..68f5630a72d 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.7 26 Apr 2000 +!== DOMAIN_CONTROL.txt for Samba release 2.0.8 17 Apr 2001 !== Initial Release: August 22, 1996 Contributor: John H Terpstra diff --git a/docs/textdocs/DOMAIN_MEMBER.txt b/docs/textdocs/DOMAIN_MEMBER.txt index 719dcf1ca24..f17c6bde297 100644 --- a/docs/textdocs/DOMAIN_MEMBER.txt +++ b/docs/textdocs/DOMAIN_MEMBER.txt @@ -1,5 +1,5 @@ !== -!== DOMAIN_MEMBER.txt for Samba release 2.0.7 26 Apr 2000 +!== DOMAIN_MEMBER.txt for Samba release 2.0.8 17 Apr 2001 !== TITLE INFORMATION: Joining an NT Domain with Samba 2.0 diff --git a/docs/textdocs/ENCRYPTION.txt b/docs/textdocs/ENCRYPTION.txt index e0fc3d573dc..1599d4e7f2d 100644 --- a/docs/textdocs/ENCRYPTION.txt +++ b/docs/textdocs/ENCRYPTION.txt @@ -1,5 +1,5 @@ !== -!== ENCRYPTION.txt for Samba release 2.0.7 26 Apr 2000 +!== ENCRYPTION.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Jeremy Allison Updated: April 19, 1999 diff --git a/docs/textdocs/Faxing.txt b/docs/textdocs/Faxing.txt index 95be95f0ae7..75739c77440 100644 --- a/docs/textdocs/Faxing.txt +++ b/docs/textdocs/Faxing.txt @@ -1,5 +1,5 @@ !== -!== Faxing.txt for Samba release 2.0.7 26 Apr 2000 +!== Faxing.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Gerhard Zuber Date: August 5th 1997. diff --git a/docs/textdocs/File-Cacheing.txt b/docs/textdocs/File-Cacheing.txt index f00847f304b..a52bbdf701e 100644 --- a/docs/textdocs/File-Cacheing.txt +++ b/docs/textdocs/File-Cacheing.txt @@ -1,5 +1,5 @@ !== -!== File-Cacheing.txt for Samba release 2.0.7 26 Apr 2000 +!== File-Cacheing.txt for Samba release 2.0.8 17 Apr 2001 !== Some people report problems with "cacheing" of data. Generally the bug report goes like this: diff --git a/docs/textdocs/GOTCHAS.txt b/docs/textdocs/GOTCHAS.txt index 417790a36a4..5fe92c2b91c 100644 --- a/docs/textdocs/GOTCHAS.txt +++ b/docs/textdocs/GOTCHAS.txt @@ -1,5 +1,5 @@ !== -!== GOTCHAS.txt for Samba release 2.0.7 26 Apr 2000 +!== GOTCHAS.txt for Samba release 2.0.8 17 Apr 2001 !== This file lists Gotchas to watch out for: ========================================================================= diff --git a/docs/textdocs/HINTS.txt b/docs/textdocs/HINTS.txt index b7c65975dfb..37faf2b451d 100644 --- a/docs/textdocs/HINTS.txt +++ b/docs/textdocs/HINTS.txt @@ -1,5 +1,5 @@ !== -!== HINTS.txt for Samba release 2.0.7 26 Apr 2000 +!== HINTS.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Many Updated: Not for a long time! diff --git a/docs/textdocs/MIRRORS.txt b/docs/textdocs/MIRRORS.txt index 7140c5915d4..1b7de1cb41a 100755 --- a/docs/textdocs/MIRRORS.txt +++ b/docs/textdocs/MIRRORS.txt @@ -1,5 +1,5 @@ !== -!== MIRRORS.txt for Samba release 2.0.7 26 Apr 2000 +!== MIRRORS.txt for Samba release 2.0.8 17 Apr 2001 !== 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 adccecfd801..1e4f481a8c7 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.7 26 Apr 2000 +!== Macintosh_Clients.txt for Samba release 2.0.8 17 Apr 2001 !== > Are there any Macintosh clients for Samba? diff --git a/docs/textdocs/NT-Guest-Access.txt b/docs/textdocs/NT-Guest-Access.txt index 590e5fc5725..746be8220d6 100644 --- a/docs/textdocs/NT-Guest-Access.txt +++ b/docs/textdocs/NT-Guest-Access.txt @@ -1,5 +1,5 @@ !== -!== NT-Guest-Access.txt for Samba release 2.0.7 26 Apr 2000 +!== NT-Guest-Access.txt for Samba release 2.0.8 17 Apr 2001 !== > Hi folks ... I don't know if you have seen this, have corrected this yet > or it is my configuration. diff --git a/docs/textdocs/NTDOMAIN.txt b/docs/textdocs/NTDOMAIN.txt index ad81042f066..79f37f65e1f 100644 --- a/docs/textdocs/NTDOMAIN.txt +++ b/docs/textdocs/NTDOMAIN.txt @@ -1,5 +1,5 @@ !== -!== NTDOMAIN.txt for Samba release 2.0.7 26 Apr 2000 +!== NTDOMAIN.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Luke Kenneth Casson Leighton (samba@samba.org) Copyright (C) 1997 Luke Kenneth Casson Leighton diff --git a/docs/textdocs/NT_Security.txt b/docs/textdocs/NT_Security.txt index 64a0458c4ea..bdb02f10d34 100644 --- a/docs/textdocs/NT_Security.txt +++ b/docs/textdocs/NT_Security.txt @@ -1,5 +1,5 @@ !== -!== NT_Security.txt for Samba release 2.0.7 26 Apr 2000 +!== NT_Security.txt for Samba release 2.0.8 17 Apr 2001 !== TITLE INFORMATION: Viewing and changing UNIX permissions using the NT security dialogs in Samba 2.0.4 diff --git a/docs/textdocs/NetBIOS.txt b/docs/textdocs/NetBIOS.txt index 630acbd903d..3168437cd13 100644 --- a/docs/textdocs/NetBIOS.txt +++ b/docs/textdocs/NetBIOS.txt @@ -1,5 +1,5 @@ !== -!== NetBIOS.txt for Samba release 2.0.7 26 Apr 2000 +!== NetBIOS.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: lkcl - samba@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 06942cebfaf..1ba39decdd1 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.7 26 Apr 2000 +!== OS2-Client-HOWTO.txt for Samba release 2.0.8 17 Apr 2001 !== diff --git a/docs/textdocs/PRINTER_DRIVER.txt b/docs/textdocs/PRINTER_DRIVER.txt index 5f0b10eda94..cd5da5938ff 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.7 26 Apr 2000 +!== PRINTER_DRIVER.txt for Samba release 2.0.8 17 Apr 2001 !== ========================================================================== Supporting the famous PRINTER$ share diff --git a/docs/textdocs/PROFILES.txt b/docs/textdocs/PROFILES.txt index ed02f09dbee..dddfafd63d1 100644 --- a/docs/textdocs/PROFILES.txt +++ b/docs/textdocs/PROFILES.txt @@ -1,5 +1,5 @@ !== -!== PROFILES.txt for Samba release 2.0.7 26 Apr 2000 +!== PROFILES.txt for Samba release 2.0.8 17 Apr 2001 !== Contributors: Bruce Cook Copyright (C) 1998 Bruce Cook diff --git a/docs/textdocs/Passwords.txt b/docs/textdocs/Passwords.txt index 8aee64852e3..3f7c1d53b43 100644 --- a/docs/textdocs/Passwords.txt +++ b/docs/textdocs/Passwords.txt @@ -1,5 +1,5 @@ !== -!== Passwords.txt for Samba release 2.0.7 26 Apr 2000 +!== Passwords.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Unknown Date: Updated April 19th 1999. diff --git a/docs/textdocs/Printing.txt b/docs/textdocs/Printing.txt index c368b37cae8..ec9de020fde 100644 --- a/docs/textdocs/Printing.txt +++ b/docs/textdocs/Printing.txt @@ -1,5 +1,5 @@ !== -!== Printing.txt for Samba release 2.0.7 26 Apr 2000 +!== Printing.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Unknown Date: Unknown diff --git a/docs/textdocs/Recent-FAQs.txt b/docs/textdocs/Recent-FAQs.txt index 8ef0353edf5..8338c249d32 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.7 26 Apr 2000 +!== Recent-FAQs.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Samba-bugs@samba.org Date: July 5, 1998 diff --git a/docs/textdocs/RoutedNetworks.txt b/docs/textdocs/RoutedNetworks.txt index 2902ae66e1e..7f32be60010 100644 --- a/docs/textdocs/RoutedNetworks.txt +++ b/docs/textdocs/RoutedNetworks.txt @@ -1,5 +1,5 @@ !== -!== RoutedNetworks.txt for Samba release 2.0.7 26 Apr 2000 +!== RoutedNetworks.txt for Samba release 2.0.8 17 Apr 2001 !== #NOFNR Flag in LMHosts to Communicate Across Routers diff --git a/docs/textdocs/SCO.txt b/docs/textdocs/SCO.txt index f6959d30a82..b463f4fedc7 100644 --- a/docs/textdocs/SCO.txt +++ b/docs/textdocs/SCO.txt @@ -1,5 +1,5 @@ !== -!== SCO.txt for Samba release 2.0.7 26 Apr 2000 +!== SCO.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Geza Makay Date: Unknown diff --git a/docs/textdocs/SSLeay.txt b/docs/textdocs/SSLeay.txt index 29e2cb6a0b6..002dd8c2a82 100644 --- a/docs/textdocs/SSLeay.txt +++ b/docs/textdocs/SSLeay.txt @@ -1,5 +1,5 @@ !== -!== SSLeay.txt for Samba release 2.0.7 26 Apr 2000 +!== SSLeay.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Christian Starkjohann Date: May 29, 1998 diff --git a/docs/textdocs/Speed.txt b/docs/textdocs/Speed.txt index 3d4941809f6..287d44046cf 100644 --- a/docs/textdocs/Speed.txt +++ b/docs/textdocs/Speed.txt @@ -1,5 +1,5 @@ !== -!== Speed.txt for Samba release 2.0.7 26 Apr 2000 +!== Speed.txt for Samba release 2.0.8 17 Apr 2001 !== Subject: Samba performance issues diff --git a/docs/textdocs/Speed2.txt b/docs/textdocs/Speed2.txt index 6dc4db1c85c..f39433377f9 100644 --- a/docs/textdocs/Speed2.txt +++ b/docs/textdocs/Speed2.txt @@ -1,5 +1,5 @@ !== -!== Speed2.txt for Samba release 2.0.7 26 Apr 2000 +!== Speed2.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Paul Cochrane Organization: Dundee Limb Fitting Centre diff --git a/docs/textdocs/Support.txt b/docs/textdocs/Support.txt index 03340d28760..0d7a0d687b3 100644 --- a/docs/textdocs/Support.txt +++ b/docs/textdocs/Support.txt @@ -1,5 +1,5 @@ !== -!== Support.txt for Samba release 2.0.7 26 Apr 2000 +!== Support.txt for Samba release 2.0.8 17 Apr 2001 !== The Samba Consultants List ========================== diff --git a/docs/textdocs/Tracing.txt b/docs/textdocs/Tracing.txt index 9c53412e606..29b160dc139 100644 --- a/docs/textdocs/Tracing.txt +++ b/docs/textdocs/Tracing.txt @@ -1,5 +1,5 @@ !== -!== Tracing.txt for Samba release 2.0.7 26 Apr 2000 +!== Tracing.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Andrew Tridgell Date: Old diff --git a/docs/textdocs/UNIX-SMB.txt b/docs/textdocs/UNIX-SMB.txt index 26825afbbf7..0ef69c23400 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.7 26 Apr 2000 +!== UNIX-SMB.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Andrew Tridgell Date: April 1995 diff --git a/docs/textdocs/UNIX_INSTALL.txt b/docs/textdocs/UNIX_INSTALL.txt index 229fc1e0f09..8fc59250f1d 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.7 26 Apr 2000 +!== UNIX_INSTALL.txt for Samba release 2.0.8 17 Apr 2001 !== HOW TO INSTALL AND TEST SAMBA ============================= diff --git a/docs/textdocs/UNIX_SECURITY.txt b/docs/textdocs/UNIX_SECURITY.txt index 6ad13c2ec3f..0f538a0cbd2 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.7 26 Apr 2000 +!== UNIX_SECURITY.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: John H Terpstra Date: July 5, 1998 diff --git a/docs/textdocs/Win95.txt b/docs/textdocs/Win95.txt index 597dd2bc5c4..c30d590ac40 100644 --- a/docs/textdocs/Win95.txt +++ b/docs/textdocs/Win95.txt @@ -1,5 +1,5 @@ !== -!== Win95.txt for Samba release 2.0.7 26 Apr 2000 +!== Win95.txt for Samba release 2.0.8 17 Apr 2001 !== Copyright (C) 1997 - Samba-Team Contributed Date: August 20, 1997 diff --git a/docs/textdocs/WinNT.txt b/docs/textdocs/WinNT.txt index 4f21c64630b..991fae8e4b2 100644 --- a/docs/textdocs/WinNT.txt +++ b/docs/textdocs/WinNT.txt @@ -1,5 +1,5 @@ !== -!== WinNT.txt for Samba release 2.0.7 26 Apr 2000 +!== WinNT.txt for Samba release 2.0.8 17 Apr 2001 !== Contributors: Various Password Section - Copyright (C) 1997 - John H Terpstra diff --git a/docs/textdocs/cifsntdomain.txt b/docs/textdocs/cifsntdomain.txt index 01b101c01f8..f4f59822010 100644 --- a/docs/textdocs/cifsntdomain.txt +++ b/docs/textdocs/cifsntdomain.txt @@ -1,5 +1,5 @@ !== -!== cifsntdomain.txt for Samba release 2.0.7 26 Apr 2000 +!== cifsntdomain.txt for Samba release 2.0.8 17 Apr 2001 !== NT Domain Authentication ------------------------ diff --git a/docs/textdocs/security_level.txt b/docs/textdocs/security_level.txt index 0a434b60284..bc5e960d087 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.7 26 Apr 2000 +!== security_level.txt for Samba release 2.0.8 17 Apr 2001 !== Contributor: Andrew Tridgell Updated: June 27, 1997 diff --git a/docs/textdocs/smbmount.txt b/docs/textdocs/smbmount.txt index 4d3df1bec13..235ae24a149 100644 --- a/docs/textdocs/smbmount.txt +++ b/docs/textdocs/smbmount.txt @@ -1,5 +1,5 @@ !== -!== smbmount.txt for Samba release 2.0.7 26 Apr 2000 +!== smbmount.txt for Samba release 2.0.8 17 Apr 2001 !== Date: October 15, 1999 Contributor: Urban Widmark diff --git a/docs/yodldocs/smbspool.8.yo b/docs/yodldocs/smbspool.8.yo index 53388601a52..eed28726fe5 100644 --- a/docs/yodldocs/smbspool.8.yo +++ b/docs/yodldocs/smbspool.8.yo @@ -3,7 +3,9 @@ mailto(samba@samba.org) manpage(smbspool htmlcommand((1)))(1)(11 October 1999)(Samba)(SAMBA) label(NAME) -manpagename(smbspool)(send print file to an SMB printer) + +label(NAME) +manpagename(smbspool)(mount an SMB filesystem) label(SYNOPSIS) manpagesynopsis() @@ -15,7 +17,7 @@ manpagedescription() This program is part of the Samba suite. smbspool is a very small print spooling program that sends a print -file to an SMB printer. The command-line arguments are position-dependent for +file to a SMB printer. The command-line arguments are position-dependent for compatibility with the Common UNIX Printing System, but you can use smbspool with any printing system or from a program or script. @@ -68,7 +70,7 @@ standard input. label(VERSION) manpagesection(VERSION) -This man page is correct for version 2.0 of the Samba suite. +This man page is correct for version 2\&.0 of the Samba suite\&. label(SEEALSO) manpagesection(SEE ALSO) diff --git a/packaging/PHT/TurboLinux/samba2.spec.tmpl b/packaging/PHT/TurboLinux/samba2.spec.tmpl index b5b9832add3..da331572452 100644 --- a/packaging/PHT/TurboLinux/samba2.spec.tmpl +++ b/packaging/PHT/TurboLinux/samba2.spec.tmpl @@ -61,10 +61,6 @@ server. Please use it with care. If you do not need it then do NOT install. %changelog -* Mon May 29 2000 John H Terpstra -- moved linkage of libnss_wins.so.2 to %post -- added removal step to %postun - * Fri Apr 14 2000 John H Terpstra - Added unicode pages @@ -222,6 +218,7 @@ done # Install the nsswitch library extension file install -m755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/lib +ln -s $RPM_BUILD_ROOT/lib/libnss_wins.so $RPM_BUILD_ROOT/lib/libnss_wins.so.2 # Install SWAT helper files for i in swat/help/*.html @@ -321,8 +318,6 @@ if [ -f /etc/xinetd.conf ]; then mv /etc/xinetd.conf /etc/xinetd.conf.presamba /usr/sbin/itox --daemon_dir /usr/sbin < /etc/inetd.conf > /etc/xinetd.conf fi -# Make link for wins resolver -ln -s /lib/libnss_wins.so /lib/libnss_wins.so.2 %preun if [ $1 = 0 ] ; then @@ -370,7 +365,6 @@ fi if [ -f /sbin/mount.smb ]; then rm -f /sbin/mount.smb fi -rm -f /lib/libnss_wins.so.2 %triggerpostun -- samba < samba-2.0.0 if [ $0 != 0 ]; then diff --git a/packaging/SGI/idb.pl b/packaging/SGI/idb.pl index 4d472dc070d..00843777ca5 100755 --- a/packaging/SGI/idb.pl +++ b/packaging/SGI/idb.pl @@ -85,7 +85,7 @@ closedir(DIR); # install the swat files chdir "$SRCDIR/source"; system("chmod +x ./script/installswat.sh"); -system("./script/installswat.sh ../packaging/SGI/swat ./ ../packaging/SGI/swat/using_samba"); +system("./script/installswat.sh ../packaging/SGI/swat ./"); system("cp -f ../swat/README ../packaging/SGI/swat"); chdir $curdir; @@ -100,7 +100,6 @@ chdir $curdir; # the files installed in docs include all the original files in docs plus all # the "*.doc" files from the source tree @docs = sort byfilename grep (!/^docs\/$/ & (/^source\/.*\.doc$/ | /^docs\//),@allfiles); -@docs = grep(!/htmldocs\/using_samba/, @docs); @swatfiles = sort grep(/^packaging\/SGI\/swat/, @allfiles); @catman = sort grep(/^packaging\/SGI\/catman/ & !/\/$/, @allfiles); @@ -122,7 +121,6 @@ if ($PKG eq "samba_irix") { print IDB "f 0644 root sys usr/relnotes/samba_irix/TC build/TC $PKG.man.relnotes\n"; print IDB "f 0644 root sys usr/relnotes/samba_irix/ch1.z build/ch1.z $PKG.man.relnotes\n"; print IDB "f 0644 root sys usr/relnotes/samba_irix/ch2.z build/ch2.z $PKG.man.relnotes\n"; - print IDB "f 0644 root sys usr/relnotes/samba_irix/ch3.z build/ch3.z $PKG.man.relnotes\n"; } else { @copyfile = grep (/^COPY/,@allfiles); @@ -142,22 +140,22 @@ while(@bins) { if (index($nextfile,'$')) { if ($filename eq "smbpasswd") { - print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n"; + print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base nostrip\n"; } elsif ($filename eq "findsmb") { print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base\n"; } elsif ($filename eq "swat") { - print IDB "f 4755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base preop(\"chroot \$rbase /etc/init.d/samba stop\") exitop(\"chroot \$rbase /usr/samba/scripts/startswat.sh\") removeop(\"chroot \$rbase /sbin/cp /etc/inetd.conf /etc/inetd.conf.O ; chroot \$rbase /sbin/sed -e '/^swat/D' -e '/^#SWAT/D' /etc/inetd.conf.O >/etc/inetd.conf; /etc/killall -HUP inetd || true\")\n"; + print IDB "f 4755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base nostrip preop(\"chroot \$rbase /etc/init.d/samba stop\") exitop(\"chroot \$rbase /usr/samba/scripts/startswat.sh\") removeop(\"chroot \$rbase /sbin/cp /etc/inetd.conf /etc/inetd.conf.O ; chroot \$rbase /sbin/sed -e '/^swat/D' -e '/^#SWAT/D' /etc/inetd.conf.O >/etc/inetd.conf; /etc/killall -HUP inetd || true\")\n"; } elsif ($filename eq "sambalp") { - print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base \n"; + print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base nostrip\n"; } elsif ($filename eq "smbprint") { print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/packaging/SGI/$filename $PKG.sw.base\n"; } else { - print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base \n"; + print IDB "f 0755 root sys usr/samba/bin/$filename $SRCPFX/source/$nextfile $PKG.sw.base nostrip\n"; } } } @@ -181,7 +179,7 @@ print IDB "d 0755 root sys usr/samba/lib $SRCPFX/packaging/SGI $PKG.sw.base\n"; print IDB "d 0755 root sys usr/samba/lib/codepages $SRCPFX/packaging/SGI $PKG.sw.base\n"; while (@codepage) { $nextpage = shift @codepage; - print IDB "f 0644 root sys usr/samba/lib/codepages/$nextpage $SRCPFX/packaging/SGI/codepages/$nextpage $PKG.sw.base nostrip \n"; + print IDB "f 0644 root sys usr/samba/lib/codepages/$nextpage $SRCPFX/packaging/SGI/codepages/$nextpage $PKG.sw.base\n"; } print IDB "f 0644 root sys usr/samba/lib/smb.conf $SRCPFX/packaging/SGI/smb.conf $PKG.sw.base config(suggest)\n"; diff --git a/source/acconfig.h b/source/acconfig.h index df8a7af168e..9e42390ebee 100644 --- a/source/acconfig.h +++ b/source/acconfig.h @@ -108,6 +108,7 @@ #undef HAVE_EXPLICIT_LARGEFILE_SUPPORT #undef USE_BOTH_CRYPT_CALLS #undef HAVE_BROKEN_FCNTL64_LOCKS +#undef HAVE_SECURE_MKSTEMP #undef HAVE_FNMATCH #undef USE_SETEUID #undef USE_SETRESUID diff --git a/source/client/client.c b/source/client/client.c index a002b11fcda..7a78be06231 100644 --- a/source/client/client.c +++ b/source/client/client.c @@ -842,18 +842,24 @@ view the file using the pager ****************************************************************************/ static void cmd_more(void) { - fstring rname,lname,tmpname,pager_cmd; + fstring rname,lname,pager_cmd; char *pager; + int fd; fstrcpy(rname,cur_dir); fstrcat(rname,"\\"); - slprintf(tmpname, - sizeof(fstring)-1, - "%s/smbmore.%d",tmpdir(),(int)getpid()); - fstrcpy(lname,tmpname); - + + slprintf(lname,sizeof(lname)-1, "%s/smbmore.XXXXXX",tmpdir()); + fd = smb_mkstemp(lname); + if (fd == -1) { + DEBUG(0,("failed to create temporary file for more\n")); + return; + } + close(fd); + if (!next_token(NULL,rname+strlen(rname),NULL,sizeof(rname)-strlen(rname))) { DEBUG(0,("more \n")); + unlink(lname); return; } dos_clean_name(rname); @@ -863,9 +869,9 @@ static void cmd_more(void) pager=getenv("PAGER"); slprintf(pager_cmd,sizeof(pager_cmd)-1, - "%s %s",(pager? pager:PAGER), tmpname); + "%s %s",(pager? pager:PAGER), lname); system(pager_cmd); - unlink(tmpname); + unlink(lname); } @@ -1157,9 +1163,18 @@ static void cmd_mput(void) pstring cmd; pstring tmpname; FILE *f; + int fd; + + slprintf(tmpname,sizeof(tmpname)-1, "%s/ls.smb.XXXXXX", + tmpdir()); + fd = smb_mkstemp(tmpname); + + if (fd == -1) { + DEBUG(0,("Failed to create temporary file %s\n", + tmpname)); + continue; + } - slprintf(tmpname,sizeof(pstring)-1, - "%s/ls.smb.%d",tmpdir(),(int)getpid()); if (recurse) slprintf(cmd,sizeof(pstring)-1, "find . -name \"%s\" -print > %s",p,tmpname); @@ -1167,9 +1182,11 @@ static void cmd_mput(void) slprintf(cmd,sizeof(pstring)-1, "find . -maxdepth 1 -name \"%s\" -print > %s",p,tmpname); system(cmd); + close(fd); f = sys_fopen(tmpname,"r"); if (!f) continue; + unlink(tmpname); while (!feof(f)) { pstring quest; @@ -1215,7 +1232,6 @@ static void cmd_mput(void) do_put(rname,lname); } fclose(f); - unlink(tmpname); } } diff --git a/source/configure b/source/configure index decbf910606..7b2c37db8af 100755 --- a/source/configure +++ b/source/configure @@ -8850,8 +8850,57 @@ EOF fi +echo $ac_n "checking for secure mkstemp""... $ac_c" 1>&6 +echo "configure:8855: checking for secure mkstemp" >&5 +if eval "test \"`echo '$''{'samba_cv_HAVE_SECURE_MKSTEMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +if test "$cross_compiling" = yes; then + samba_cv_HAVE_SECURE_MKSTEMP=cross +else + cat > conftest.$ac_ext < +#include +#include +#include +main() { + struct stat st; + char tpl[20]="/tmp/test.XXXXXX"; + int fd = mkstemp(tpl); + if (fd == -1) exit(1); + unlink(tpl); + if (fstat(fd, &st) != 0) exit(1); + if ((st.st_mode & 0777) != 0600) exit(1); + exit(0); +} +EOF +if { (eval echo configure:8881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + samba_cv_HAVE_SECURE_MKSTEMP=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + samba_cv_HAVE_SECURE_MKSTEMP=no +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$samba_cv_HAVE_SECURE_MKSTEMP" 1>&6 +if test x"$samba_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_SECURE_MKSTEMP 1 +EOF + +fi + echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6 -echo "configure:8855: checking for broken inet_ntoa" >&5 +echo "configure:8904: checking for broken inet_ntoa" >&5 if eval "test \"`echo '$''{'samba_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8860,7 +8909,7 @@ if test "$cross_compiling" = yes; then samba_cv_REPLACE_INET_NTOA=cross else cat > conftest.$ac_ext < @@ -8874,7 +8923,7 @@ if (strcmp(inet_ntoa(ip),"18.52.86.120") && strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } exit(1);} EOF -if { (eval echo configure:8878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_REPLACE_INET_NTOA=yes else @@ -8897,7 +8946,7 @@ EOF fi echo $ac_n "checking for sysconf(_SC_NGROUPS_MAX)""... $ac_c" 1>&6 -echo "configure:8901: checking for sysconf(_SC_NGROUPS_MAX)" >&5 +echo "configure:8950: checking for sysconf(_SC_NGROUPS_MAX)" >&5 if eval "test \"`echo '$''{'samba_cv_SYSCONF_SC_NGROUPS_MAX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8906,12 +8955,12 @@ if test "$cross_compiling" = yes; then samba_cv_SYSCONF_SC_NGROUPS_MAX=cross else cat > conftest.$ac_ext < main() { exit(sysconf(_SC_NGROUPS_MAX) == -1 ? 1 : 0); } EOF -if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_SYSCONF_SC_NGROUPS_MAX=yes else @@ -8934,7 +8983,7 @@ EOF fi echo $ac_n "checking for root""... $ac_c" 1>&6 -echo "configure:8938: checking for root" >&5 +echo "configure:8987: checking for root" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_ROOT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8943,11 +8992,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_ROOT=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_ROOT=yes else @@ -8975,7 +9024,7 @@ fi # look for a method of finding the list of network interfaces iface=no; echo $ac_n "checking for iface AIX""... $ac_c" 1>&6 -echo "configure:8979: checking for iface AIX" >&5 +echo "configure:9028: checking for iface AIX" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_AIX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8984,7 +9033,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_IFACE_AIX=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_IFACE_AIX=yes else @@ -9016,7 +9065,7 @@ fi if test $iface = no; then echo $ac_n "checking for iface ifconf""... $ac_c" 1>&6 -echo "configure:9020: checking for iface ifconf" >&5 +echo "configure:9069: checking for iface ifconf" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9025,7 +9074,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_IFACE_IFCONF=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_IFACE_IFCONF=yes else @@ -9058,7 +9107,7 @@ fi if test $iface = no; then echo $ac_n "checking for iface ifreq""... $ac_c" 1>&6 -echo "configure:9062: checking for iface ifreq" >&5 +echo "configure:9111: checking for iface ifreq" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFREQ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9067,7 +9116,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_IFACE_IFREQ=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_IFACE_IFREQ=yes else @@ -9104,7 +9153,7 @@ fi seteuid=no; if test $seteuid = no; then echo $ac_n "checking for setresuid""... $ac_c" 1>&6 -echo "configure:9108: checking for setresuid" >&5 +echo "configure:9157: checking for setresuid" >&5 if eval "test \"`echo '$''{'samba_cv_USE_SETRESUID'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9113,7 +9162,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETRESUID=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETRESUID=yes else @@ -9147,7 +9196,7 @@ fi if test $seteuid = no; then echo $ac_n "checking for setreuid""... $ac_c" 1>&6 -echo "configure:9151: checking for setreuid" >&5 +echo "configure:9200: checking for setreuid" >&5 if eval "test \"`echo '$''{'samba_cv_USE_SETREUID'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9156,7 +9205,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETREUID=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETREUID=yes else @@ -9189,7 +9238,7 @@ fi if test $seteuid = no; then echo $ac_n "checking for seteuid""... $ac_c" 1>&6 -echo "configure:9193: checking for seteuid" >&5 +echo "configure:9242: checking for seteuid" >&5 if eval "test \"`echo '$''{'samba_cv_USE_SETEUID'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9198,7 +9247,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETEUID=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETEUID=yes else @@ -9231,7 +9280,7 @@ fi if test $seteuid = no; then echo $ac_n "checking for setuidx""... $ac_c" 1>&6 -echo "configure:9235: checking for setuidx" >&5 +echo "configure:9284: checking for setuidx" >&5 if eval "test \"`echo '$''{'samba_cv_USE_SETUIDX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9240,7 +9289,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETUIDX=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETUIDX=yes else @@ -9273,7 +9322,7 @@ fi echo $ac_n "checking for shared mmap""... $ac_c" 1>&6 -echo "configure:9277: checking for shared mmap" >&5 +echo "configure:9326: checking for shared mmap" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_SHARED_MMAP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9282,11 +9331,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_SHARED_MMAP=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_SHARED_MMAP=yes else @@ -9313,7 +9362,7 @@ EOF fi echo $ac_n "checking for ftruncate needs root""... $ac_c" 1>&6 -echo "configure:9317: checking for ftruncate needs root" >&5 +echo "configure:9366: checking for ftruncate needs root" >&5 if eval "test \"`echo '$''{'samba_cv_FTRUNCATE_NEEDS_ROOT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9322,11 +9371,11 @@ if test "$cross_compiling" = yes; then samba_cv_FTRUNCATE_NEEDS_ROOT=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_FTRUNCATE_NEEDS_ROOT=yes else @@ -9349,7 +9398,7 @@ EOF fi echo $ac_n "checking for fcntl locking""... $ac_c" 1>&6 -echo "configure:9353: checking for fcntl locking" >&5 +echo "configure:9402: checking for fcntl locking" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_FCNTL_LOCK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9358,11 +9407,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_FCNTL_LOCK=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_FCNTL_LOCK=yes else @@ -9385,7 +9434,7 @@ EOF fi echo $ac_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking""... $ac_c" 1>&6 -echo "configure:9389: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5 +echo "configure:9438: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_FCNTL64_LOCKS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9394,11 +9443,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes else @@ -9423,7 +9472,7 @@ else echo $ac_n "checking for 64 bit fcntl locking""... $ac_c" 1>&6 -echo "configure:9427: checking for 64 bit fcntl locking" >&5 +echo "configure:9476: checking for 64 bit fcntl locking" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_FLOCK64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9432,7 +9481,7 @@ else samba_cv_HAVE_STRUCT_FLOCK64=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_STRUCT_FLOCK64=yes else @@ -9481,7 +9530,7 @@ EOF fi echo $ac_n "checking for sysv ipc""... $ac_c" 1>&6 -echo "configure:9485: checking for sysv ipc" >&5 +echo "configure:9534: checking for sysv ipc" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_SYSV_IPC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9490,11 +9539,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_SYSV_IPC=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_SYSV_IPC=yes else @@ -9517,7 +9566,7 @@ EOF fi echo $ac_n "checking for IRIX sysv ipc semun problem using gcc""... $ac_c" 1>&6 -echo "configure:9521: checking for IRIX sysv ipc semun problem using gcc" >&5 +echo "configure:9570: checking for IRIX sysv ipc semun problem using gcc" >&5 if eval "test \"`echo '$''{'samba_cv_NEED_SGI_SEMUN_HACK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9526,11 +9575,11 @@ if test "$cross_compiling" = yes; then samba_cv_NEED_SGI_SEMUN_HACK=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_NEED_SGI_SEMUN_HACK=yes else @@ -9553,7 +9602,7 @@ EOF fi echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6 -echo "configure:9557: checking for a crypt that needs truncated salt" >&5 +echo "configure:9606: checking for a crypt that needs truncated salt" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_TRUNCATED_SALT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9562,11 +9611,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_TRUNCATED_SALT=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_TRUNCATED_SALT=no else @@ -9589,13 +9638,13 @@ EOF fi echo $ac_n "checking for broken nisplus include files""... $ac_c" 1>&6 -echo "configure:9593: checking for broken nisplus include files" >&5 +echo "configure:9642: checking for broken nisplus include files" >&5 if eval "test \"`echo '$''{'samba_cv_BROKEN_NISPLUS_INCLUDE_FILES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if defined(HAVE_RPCSVC_NIS_H) @@ -9605,7 +9654,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:9609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no else @@ -9629,7 +9678,7 @@ fi ################################################# # check for smbwrapper support echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6 -echo "configure:9633: checking whether to use smbwrapper" >&5 +echo "configure:9682: checking whether to use smbwrapper" >&5 # Check whether --with-smbwrapper or --without-smbwrapper was given. if test "${with_smbwrapper+set}" = set; then withval="$with_smbwrapper" @@ -9673,7 +9722,7 @@ fi ################################################# # check for the AFS filesystem echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6 -echo "configure:9677: checking whether to use AFS" >&5 +echo "configure:9726: checking whether to use AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -9699,7 +9748,7 @@ fi ################################################# # check for the DFS auth system echo $ac_n "checking whether to use DFS auth""... $ac_c" 1>&6 -echo "configure:9703: checking whether to use DFS auth" >&5 +echo "configure:9752: checking whether to use DFS auth" >&5 # Check whether --with-dfs or --without-dfs was given. if test "${with_dfs+set}" = set; then withval="$with_dfs" @@ -9724,7 +9773,7 @@ fi ################################################# # check for Kerberos IV auth system echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6 -echo "configure:9728: checking whether to use Kerberos IV" >&5 +echo "configure:9777: checking whether to use Kerberos IV" >&5 # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" @@ -9734,7 +9783,7 @@ if test "${with_krb4+set}" = set; then EOF echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:9738: checking for dn_expand in -lresolv" >&5 +echo "configure:9787: checking for dn_expand in -lresolv" >&5 ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9742,7 +9791,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9792,7 +9841,7 @@ fi ################################################# # check for Kerberos 5 auth system echo $ac_n "checking whether to use Kerberos 5""... $ac_c" 1>&6 -echo "configure:9796: checking whether to use Kerberos 5" >&5 +echo "configure:9845: checking whether to use Kerberos 5" >&5 # Check whether --with-krb5 or --without-krb5 was given. if test "${with_krb5+set}" = set; then withval="$with_krb5" @@ -9813,7 +9862,7 @@ fi ################################################# # check for automount support echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6 -echo "configure:9817: checking whether to use AUTOMOUNT" >&5 +echo "configure:9866: checking whether to use AUTOMOUNT" >&5 # Check whether --with-automount or --without-automount was given. if test "${with_automount+set}" = set; then withval="$with_automount" @@ -9838,7 +9887,7 @@ fi ################################################# # check for smbmount support echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6 -echo "configure:9842: checking whether to use SMBMOUNT" >&5 +echo "configure:9891: checking whether to use SMBMOUNT" >&5 # Check whether --with-smbmount or --without-smbmount was given. if test "${with_smbmount+set}" = set; then withval="$with_smbmount" @@ -9867,7 +9916,7 @@ fi ################################################# # check for a PAM password database echo $ac_n "checking whether to use PAM password database""... $ac_c" 1>&6 -echo "configure:9871: checking whether to use PAM password database" >&5 +echo "configure:9920: checking whether to use PAM password database" >&5 # Check whether --with-pam or --without-pam was given. if test "${with_pam+set}" = set; then withval="$with_pam" @@ -9894,7 +9943,7 @@ fi ################################################# # check for a LDAP password database echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 -echo "configure:9898: checking whether to use LDAP password database" >&5 +echo "configure:9947: checking whether to use LDAP password database" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" @@ -9920,7 +9969,7 @@ fi ################################################# # check for a NISPLUS password database echo $ac_n "checking whether to use NISPLUS password database""... $ac_c" 1>&6 -echo "configure:9924: checking whether to use NISPLUS password database" >&5 +echo "configure:9973: checking whether to use NISPLUS password database" >&5 # Check whether --with-nisplus or --without-nisplus was given. if test "${with_nisplus+set}" = set; then withval="$with_nisplus" @@ -9945,7 +9994,7 @@ fi ################################################# # check for a NISPLUS_HOME support echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6 -echo "configure:9949: checking whether to use NISPLUS_HOME" >&5 +echo "configure:9998: checking whether to use NISPLUS_HOME" >&5 # Check whether --with-nisplus-home or --without-nisplus-home was given. if test "${with_nisplus_home+set}" = set; then withval="$with_nisplus_home" @@ -9970,7 +10019,7 @@ fi ################################################# # check for the secure socket layer echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6 -echo "configure:9974: checking whether to use SSL" >&5 +echo "configure:10023: checking whether to use SSL" >&5 # Check whether --with-ssl or --without-ssl was given. if test "${with_ssl+set}" = set; then withval="$with_ssl" @@ -10029,7 +10078,7 @@ fi ################################################# # check for syslog logging echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6 -echo "configure:10033: checking whether to use syslog logging" >&5 +echo "configure:10082: checking whether to use syslog logging" >&5 # Check whether --with-syslog or --without-syslog was given. if test "${with_syslog+set}" = set; then withval="$with_syslog" @@ -10054,7 +10103,7 @@ fi ################################################# # check for a shared memory profiling support echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6 -echo "configure:10058: checking whether to use profiling" >&5 +echo "configure:10107: checking whether to use profiling" >&5 # Check whether --with-profile or --without-profile was given. if test "${with_profile+set}" = set; then withval="$with_profile" @@ -10080,7 +10129,7 @@ fi ################################################# # check for experimental netatalk resource fork support echo $ac_n "checking whether to support netatalk""... $ac_c" 1>&6 -echo "configure:10084: checking whether to support netatalk" >&5 +echo "configure:10133: checking whether to support netatalk" >&5 # Check whether --with-netatalk or --without-netatalk was given. if test "${with_netatalk+set}" = set; then withval="$with_netatalk" @@ -10107,7 +10156,7 @@ fi QUOTAOBJS=noquotas.o echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6 -echo "configure:10111: checking whether to support disk-quotas" >&5 +echo "configure:10160: checking whether to support disk-quotas" >&5 # Check whether --with-quotas or --without-quotas was given. if test "${with_quotas+set}" = set; then withval="$with_quotas" @@ -10131,7 +10180,7 @@ fi # check for experimental utmp accounting echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6 -echo "configure:10135: checking whether to support utmp accounting" >&5 +echo "configure:10184: checking whether to support utmp accounting" >&5 # Check whether --with-utmp or --without-utmp was given. if test "${with_utmp+set}" = set; then withval="$with_utmp" @@ -10231,7 +10280,7 @@ fi ################################################ # include Using Samba O'Reilly book echo $ac_n "checking whether to install Using Samba book""... $ac_c" 1>&6 -echo "configure:10235: checking whether to install Using Samba book" >&5 +echo "configure:10284: checking whether to install Using Samba book" >&5 # Check whether --with-sambabook or --without-sambabook was given. if test "${with_sambabook+set}" = set; then withval="$with_sambabook" @@ -10261,14 +10310,14 @@ fi ################################################# # these tests are taken from the GNU fileutils package echo "checking how to get filesystem space usage" 1>&6 -echo "configure:10265: checking how to get filesystem space usage" >&5 +echo "configure:10314: checking how to get filesystem space usage" >&5 space=no # Test for statvfs64. if test $space = no; then # SVR4 echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6 -echo "configure:10272: checking statvfs64 function (SVR4)" >&5 +echo "configure:10321: checking statvfs64 function (SVR4)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10276,7 +10325,7 @@ else fu_cv_sys_stat_statvfs64=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statvfs64=yes else @@ -10323,12 +10372,12 @@ fi if test $space = no; then # SVR4 echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 -echo "configure:10327: checking statvfs function (SVR4)" >&5 +echo "configure:10376: checking statvfs function (SVR4)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -10336,7 +10385,7 @@ int main() { struct statvfs fsd; statvfs (0, &fsd); ; return 0; } EOF -if { (eval echo configure:10340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_stat_statvfs=yes else @@ -10361,7 +10410,7 @@ fi if test $space = no; then # DEC Alpha running OSF/1 echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6 -echo "configure:10365: checking for 3-argument statfs function (DEC OSF/1)" >&5 +echo "configure:10414: checking for 3-argument statfs function (DEC OSF/1)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10369,7 +10418,7 @@ else fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext < @@ -10382,7 +10431,7 @@ else exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:10386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs3_osf1=yes else @@ -10409,7 +10458,7 @@ fi if test $space = no; then # AIX echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6 -echo "configure:10413: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 +echo "configure:10462: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10417,7 +10466,7 @@ else fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_bsize=yes else @@ -10463,7 +10512,7 @@ fi if test $space = no; then # SVR3 echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6 -echo "configure:10467: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 +echo "configure:10516: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10471,7 +10520,7 @@ else fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext < #include @@ -10481,7 +10530,7 @@ else exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:10485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs4=yes else @@ -10508,7 +10557,7 @@ fi if test $space = no; then # 4.4BSD and NetBSD echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6 -echo "configure:10512: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 +echo "configure:10561: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10516,7 +10565,7 @@ else fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext < #ifdef HAVE_SYS_PARAM_H @@ -10532,7 +10581,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:10536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_fsize=yes else @@ -10559,7 +10608,7 @@ fi if test $space = no; then # Ultrix echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6 -echo "configure:10563: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 +echo "configure:10612: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10567,7 +10616,7 @@ else fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext < #ifdef HAVE_SYS_PARAM_H @@ -10587,7 +10636,7 @@ else exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:10591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_fs_data=yes else @@ -10621,7 +10670,7 @@ fi # echo "checking if large file support can be enabled" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes else @@ -10659,11 +10708,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else diff --git a/source/configure.in b/source/configure.in index 391e8c612a7..79f43d58159 100644 --- a/source/configure.in +++ b/source/configure.in @@ -910,6 +910,28 @@ if test x"$samba_cv_HAVE_FNMATCH" = x"yes"; then AC_DEFINE(HAVE_FNMATCH) fi +AC_CACHE_CHECK([for secure mkstemp],samba_cv_HAVE_SECURE_MKSTEMP,[ +AC_TRY_RUN([#include +#include +#include +#include +main() { + struct stat st; + char tpl[20]="/tmp/test.XXXXXX"; + int fd = mkstemp(tpl); + if (fd == -1) exit(1); + unlink(tpl); + if (fstat(fd, &st) != 0) exit(1); + if ((st.st_mode & 0777) != 0600) exit(1); + exit(0); +}], +samba_cv_HAVE_SECURE_MKSTEMP=yes, +samba_cv_HAVE_SECURE_MKSTEMP=no, +samba_cv_HAVE_SECURE_MKSTEMP=cross)]) +if test x"$samba_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then + AC_DEFINE(HAVE_SECURE_MKSTEMP) +fi + AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[ AC_TRY_RUN([ #include diff --git a/source/include/config.h.in b/source/include/config.h.in index d230974f44c..bf12c08e0c9 100644 --- a/source/include/config.h.in +++ b/source/include/config.h.in @@ -174,6 +174,7 @@ #undef HAVE_EXPLICIT_LARGEFILE_SUPPORT #undef USE_BOTH_CRYPT_CALLS #undef HAVE_BROKEN_FCNTL64_LOCKS +#undef HAVE_SECURE_MKSTEMP #undef HAVE_FNMATCH #undef USE_SETEUID #undef USE_SETRESUID diff --git a/source/include/proto.h b/source/include/proto.h index 9155752f672..269a5dbbfe7 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -305,6 +305,7 @@ void zero_free(void *p, size_t size); int set_maxfiles(int requested_max); BOOL reg_split_key(char *full_keyname, uint32 *reg_type, char *key_name); char *smbd_mktemp(char *template); +int smb_mkstemp(char *template); void *memdup(void *p, size_t size); char *myhostname(void); char *parent_dirname(const char *path); diff --git a/source/include/version.h b/source/include/version.h index f4776ada015..f8db04c5368 100644 --- a/source/include/version.h +++ b/source/include/version.h @@ -1 +1 @@ -#define VERSION "2.0.7" +#define VERSION "2.0.8" diff --git a/source/lib/util.c b/source/lib/util.c index 3e9ca87fae3..68b129988c1 100644 --- a/source/lib/util.c +++ b/source/lib/util.c @@ -3118,6 +3118,21 @@ char *smbd_mktemp(char *template) return p; } +/***************************************************************** +possibly replace mkstemp if it is broken + *****************************************************************/ +int smb_mkstemp(char *template) +{ +#if HAVE_SECURE_MKSTEMP + return mkstemp(template); +#else + /* have a reasonable go at emulating it. Hope that + the system mktemp() isn't completly hopeless */ + if (!mktemp(template)) return -1; + return open(template, O_CREAT|O_EXCL|O_RDWR, 0600); +#endif +} + /***************************************************************** like strdup but for memory diff --git a/source/nmbd/nmbd_processlogon.c b/source/nmbd/nmbd_processlogon.c index 13c09e638c9..bb4b7547a6e 100644 --- a/source/nmbd/nmbd_processlogon.c +++ b/source/nmbd/nmbd_processlogon.c @@ -115,7 +115,7 @@ logons are not enabled.\n", inet_ntoa(p->ip) )); getdc = skip_string(machine,1); q = skip_string(getdc,1); - q = ALIGN2(q, outbuf); + q = ALIGN2(q, buf); /* at this point we can work out if this is a W9X or NT style request. Experiments show that the difference is wether the diff --git a/source/printing/printing.c b/source/printing/printing.c index 00882837bd5..e3743f138da 100644 --- a/source/printing/printing.c +++ b/source/printing/printing.c @@ -1021,7 +1021,7 @@ int get_printqueue(int snum, standard_sub(conn,syscmd); - slprintf(outfile,sizeof(outfile)-1, "%s/lpq.%08x",tmpdir(),str_checksum(syscmd)); + slprintf(outfile,sizeof(outfile)-1, "%s/lpq.%08x",lp_lockdir(),str_checksum(syscmd)); if (!lpq_cache_reset[snum] && cachetime && !sys_stat(outfile,&sbuf)) { if (time(NULL) - sbuf.st_mtime < cachetime) { @@ -1070,10 +1070,6 @@ int get_printqueue(int snum, if (!cachetime) { unlink(outfile); - } else { - /* we only expect this to succeed on trapdoor systems, - on normal systems the file is owned by root */ - chmod(outfile,0666); } return(count); } diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c index f36b5807ee2..8ffed2f73a2 100644 --- a/source/smbd/fileio.c +++ b/source/smbd/fileio.c @@ -121,8 +121,6 @@ ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n) if (n > 0) { readret = read(fsp->fd_ptr->fd,data,n); - if (readret == -1) - return -1; if (readret > 0) ret += readret; } diff --git a/source/smbd/message.c b/source/smbd/message.c index cc329d61a65..a1e3ecae780 100644 --- a/source/smbd/message.c +++ b/source/smbd/message.c @@ -40,8 +40,7 @@ deliver the message ****************************************************************************/ static void msg_deliver(void) { - pstring s; - fstring name; + pstring name; int i; int fd; @@ -53,13 +52,11 @@ static void msg_deliver(void) } /* put it in a temporary file */ - slprintf(s,sizeof(s)-1, "%s/msg.XXXXXX",tmpdir()); - fstrcpy(name,(char *)smbd_mktemp(s)); - - fd = sys_open(name,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL,0600); + slprintf(name,sizeof(name)-1, "%s/msg.XXXXXX",tmpdir()); + fd = smb_mkstemp(name); if (fd == -1) { - DEBUG(1,("can't open message file %s\n",name)); - return; + DEBUG(1,("can't open message file %s\n",name)); + return; } /* @@ -86,12 +83,13 @@ static void msg_deliver(void) { fstring alpha_msgfrom; fstring alpha_msgto; + pstring s; pstrcpy(s,lp_msg_command()); - pstring_sub(s,"%s",name); pstring_sub(s,"%f",alpha_strcpy(alpha_msgfrom,msgfrom,sizeof(alpha_msgfrom))); pstring_sub(s,"%t",alpha_strcpy(alpha_msgto,msgto,sizeof(alpha_msgto))); standard_sub_basic(s); + pstring_sub(s,"%s",name); smbrun(s,NULL,False); } diff --git a/source/smbd/reply.c b/source/smbd/reply.c index 9ae16f1dca3..69f20a90aa4 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -2546,7 +2546,7 @@ int reply_write_and_X(connection_struct *conn, char *inbuf,char *outbuf,int leng size_t numtowrite = SVAL(inbuf,smb_vwv10); BOOL write_through = BITSETW(inbuf+smb_vwv7,0); ssize_t nwritten = -1; - unsigned int smb_doff = SVAL(inbuf,smb_vwv11); + int smb_doff = SVAL(inbuf,smb_vwv11); char *data; /* If it's an IPC, pass off the pipe handler. */ @@ -2557,9 +2557,6 @@ int reply_write_and_X(connection_struct *conn, char *inbuf,char *outbuf,int leng CHECK_WRITE(fsp); CHECK_ERROR(fsp); - if(smb_doff > smb_len(inbuf)) - return(ERROR(ERRDOS,ERRbadmem)); - data = smb_base(inbuf) + smb_doff; if(CVAL(inbuf,smb_wct) == 14) { @@ -2965,11 +2962,9 @@ int reply_echo(connection_struct *conn, { int smb_reverb = SVAL(inbuf,smb_vwv0); int seq_num; - unsigned int data_len = smb_buflen(inbuf); + int data_len = smb_buflen(inbuf); int outsize = set_message(outbuf,1,data_len,True); - - data_len = MIN(data_len, (sizeof(inbuf)-(smb_buf(inbuf)-inbuf))); - + /* copy any incoming data back out */ if (data_len > 0) memcpy(smb_buf(outbuf),smb_buf(inbuf),data_len); diff --git a/source/smbwrapper/shared.c b/source/smbwrapper/shared.c index f7f7b8c8ea9..16d6ae3cf8e 100644 --- a/source/smbwrapper/shared.c +++ b/source/smbwrapper/shared.c @@ -33,15 +33,14 @@ setup the shared area void smbw_setup_shared(void) { int fd; - pstring s, name; + pstring name; - slprintf(s,sizeof(s)-1, "%s/smbw.XXXXXX",tmpdir()); + slprintf(name,sizeof(name)-1, "%s/smbw.XXXXXX",tmpdir()); - fstrcpy(name,(char *)smbd_mktemp(s)); + fd = smb_mkstemp(name); - /* note zero permissions! don't change this */ - fd = sys_open(name,O_RDWR|O_CREAT|O_TRUNC|O_EXCL,0); if (fd == -1) goto failed; + unlink(name); shared_fd = set_maxfiles(SMBW_MAX_OPEN); @@ -54,9 +53,9 @@ void smbw_setup_shared(void) DEBUG(4,("created shared_fd=%d\n", shared_fd)); - slprintf(s,sizeof(s)-1,"%d", shared_fd); + slprintf(name,sizeof(name)-1,"%d", shared_fd); - smbw_setenv("SMBW_HANDLE", s); + smbw_setenv("SMBW_HANDLE", name); return; diff --git a/source/utils/testparm.c b/source/utils/testparm.c index e4f603e0ce2..3f31b25fe82 100644 --- a/source/utils/testparm.c +++ b/source/utils/testparm.c @@ -70,7 +70,7 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n"); lp_lockdir()); ret = 1; } else if ((st.st_mode & 0777) != 0755) { - printf("WARNING: lock directory %s should have permissions 0755 for browsing to work\n", + printf("ERROR: lock directory %s should have permissions 0755 for security and for browsing to work\n", lp_lockdir()); ret = 1; } diff --git a/swat/help/welcome.html b/swat/help/welcome.html index 9ef62101ebc..81441d9613c 100644 --- a/swat/help/welcome.html +++ b/swat/help/welcome.html @@ -40,10 +40,10 @@ Please choose a configuration action using one of the above buttons

  • Changing UNIX permissions using NT
  • smbrun - internal smbd utility -
  • Books - +@BOOKDIR@
  • Books +@BOOKDIR@

    Feedback