- update to 2.2.0 (tdb.c patch is from samba CVS to fix a bug), new MAINTAINER (daniel@benzedrine.cx)

- put daemons in ${PREFIX}/libexec, respect CFLAGS (me)
This commit is contained in:
matt 2001-05-16 00:59:47 +00:00
parent e468f76939
commit cdfe1d3fc5
8 changed files with 453 additions and 357 deletions

View File

@ -1,70 +1,53 @@
# $OpenBSD: Makefile,v 1.38 2001/05/09 14:55:49 naddy Exp $
# $OpenBSD: Makefile,v 1.39 2001/05/16 00:59:47 matt Exp $
COMMENT= "SMB and CIFS client and server for UNIX"
DISTNAME= samba-2.0.9
DISTNAME= samba-2.2.0
CATEGORIES= net
NEED_VERSION= 1.384
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
http://us1.samba.org/samba/ftp/ \
ftp://ca.samba.org/pub/samba/ \
ftp://ftp.uni-trier.de/pub/unix/network/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/
NEED_VERSION= 1.396
HOMEPAGE= http://www.samba.org/
MAINTAINER= ports@openbsd.org
MAINTAINER= Daniel Hartmeier <daniel@benzedrine.cx>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.samba.org/pub/samba/ \
http://us1.samba.org/samba/ftp/ \
ftp://ca.samba.org/pub/samba/ \
ftp://ftp.uni-trier.de/pub/unix/network/samba/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/
FAKE_FLAGS+= prefix="${WRKINST}${PREFIX}" \
BASEDIR="${WRKINST}${PREFIX}" \
LIBDIR="${WRKINST}${PREFIX}/lib/samba" \
SWATDIR="${WRKINST}${PREFIX}/share/swat" \
SBINDIR="${WRKINST}${PREFIX}/libexec"
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= LIBS=-lcurses
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --libdir="${PREFIX}/lib/samba" \
--localstatedir="/var" \
--with-privatedir="${SYSCONFDIR}/samba" \
--sbindir="${PREFIX}/libexec" \
--with-acl-support \
--with-configdir="${SYSCONFDIR}/samba" \
--with-lockdir="/var/spool/lock" \
--with-swatdir="${PREFIX}/swat"
FAKE_FLAGS= prefix="${WRKINST}${PREFIX}" \
LIBDIR="${WRKINST}${PREFIX}/lib/samba" \
SWATDIR="${WRKINST}${PREFIX}/swat"
--with-privatedir="${SYSCONFDIR}/samba" \
--with-swatdir="${PREFIX}/share/swat" \
--with-ssl \
--with-sslinc=/usr/include/ssl \
--with-ssllib=/usr/lib
# Warning: these aditional options have not been tested.
#CONFIGURE_ARGS+= --with-afs
#CONFIGURE_ARGS+= --with-dfs
#CONFIGURE_ARGS+= --with-krb4=/etc/kerberosIV
#CONFIGURE_ARGS+= --with-krb5=base-dir
# uncomment these to add SSL support, note that this is only useful
# for connections with other samba clients, Windows machines do not
# support SSL encrypted SMB
#CONFIGURE_ARGS+= --with-ssl
#CONFIGURE_ARGS+= --with-sslinc=/usr/include/ssl
#CONFIGURE_ARGS+= --with-ssllib=/usr/lib
# uncomment this if you want to build the smbwrapper library
#CONFIGURE_ARGS+= --with-smbwrapper
# uncomment this if you want to include support for AFS
#CONFIGURE_ARGS+= --with-afs
# uncomment this if you want to include support for DFS
#CONFIGURE_ARGS+= --with-dfs
# uncomment this if you want support for Kerberos IV
#CONFIGURE_ARGS+= --with-krb4=/etc/kerberosIV
# uncomment this if you want support for Kerberos 5
#CONFIGURE_ARGS+= --with-krb5=base-dir
# uncomment this if you want LDAP support
#CONFIGURE_ARGS+= --with-ldap
# uncomment this if you want NISPLUS password database support
#CONFIGURE_ARGS+= --with-nisplus
# uncomment this if you want NISPLUS_HOME support
#CONFIGURE_ARGS+= --with-nisplus-home
MAKE_FLAGS= PASSWD_PROGRAM="/usr/bin/passwd"
WRKDIST= ${WRKDIR}/${DISTNAME}/source
@ -102,3 +85,4 @@ post-install:
@chmod 111 ${PREFIX}/bin/smbpasswd
.include <bsd.port.mk>

View File

@ -13,11 +13,11 @@ Using samba package in OpenBSD environment:
echo -n 'starting local daemons:'
...
if [ -f /etc/samba/smb.conf ]; then
if [ X"${smbd}" = X"YES" -a -x /usr/local/sbin/smbd ]; then
echo -n ' smbd'; /usr/local/sbin/smbd -D
if [ X"${smbd}" = X"YES" -a -x /usr/local/libexec/smbd ]; then
echo -n ' smbd'; /usr/local/libexec/smbd -D
fi
if [ X"${nmbd}" = X"YES" -a -x /usr/local/sbin/nmbd ]; then
echo -n ' nmbd'; /usr/local/sbin/nmbd -D
if [ X"${nmbd}" = X"YES" -a -x /usr/local/libexec/nmbd ]; then
echo -n ' nmbd'; /usr/local/libexec/nmbd -D
fi
fi
...
@ -32,7 +32,7 @@ in the clear. You can avoid this problem by using ssh forwarding to port
4. add the following entry to /etc/inetd.conf:
...
swat stream tcp nowait.400 root /usr/local/sbin/swat swat
swat stream tcp nowait.400 root /usr/local/libexec/swat swat
...
5. add the following entry to /etc/services:

View File

@ -1,3 +1,3 @@
MD5 (samba-2.0.9.tar.gz) = 477b0be682e01fe3df1184d300cc8cff
RMD160 (samba-2.0.9.tar.gz) = c0ee2e24a733213348d25341b0175122fc5c6c6f
SHA1 (samba-2.0.9.tar.gz) = 8f0e6b1e6adca36d055d243c8062eb641a42ff38
MD5 (samba-2.2.0.tar.gz) = fb1f7d52bfa6cef6c2b471ff3981e2a6
RMD160 (samba-2.2.0.tar.gz) = 378323e142494b8e5edc3b23f76193f3458c471a
SHA1 (samba-2.2.0.tar.gz) = a7010ff4b3e99a94e8a618184e551e3e61909859

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2001/04/10 01:47:00 brad Exp $
--- Makefile.in.orig Tue Apr 25 19:06:11 2000
+++ Makefile.in Mon Apr 9 19:34:56 2001
@@ -25,7 +25,9 @@ BASEDIR= @prefix@
BINDIR = @bindir@
# we don't use sbindir because we want full compatibility with
# the previous releases of Samba
-SBINDIR = @bindir@
+#SBINDIR = @bindir@
+# previous releases of the OpenBSD port did use sbindir
+SBINDIR = @sbindir@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
@@ -37,16 +39,16 @@ INSTALLPERMS = 0755
# set these to where to find various files
# These can be overridden by command line switches (see smbd(8))
# or in smb.conf (see smb.conf(5))
-SMBLOGFILE = $(VARDIR)/log.smb
-NMBLOGFILE = $(VARDIR)/log.nmb
-CONFIGFILE = $(LIBDIR)/smb.conf
-LMHOSTSFILE = $(LIBDIR)/lmhosts
-DRIVERFILE = $(LIBDIR)/printers.def
-PASSWD_PROGRAM = /bin/passwd
+SMBLOGFILE = $(VARDIR)/log/smbd
+NMBLOGFILE = $(VARDIR)/log/nmbd
+
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
-
SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
+CONFIGFILE = $(PRIVATEDIR)/smb.conf
+LMHOSTSFILE = $(PRIVATEDIR)/lmhosts
+DRIVERFILE = $(PRIVATEDIR)/printers.def
+PASSWD_PROGRAM = /usr/bin/passwd
# This is where SWAT images and help files go
SWATDIR = @swatdir@

View File

@ -1,7 +1,17 @@
$OpenBSD: patch-configure_in,v 1.1 2001/04/10 11:36:15 brad Exp $
--- configure.in.orig Tue Apr 25 19:06:39 2000
+++ configure.in Mon Apr 9 21:49:11 2001
@@ -1363,45 +1363,47 @@ AC_MSG_CHECKING(whether to use SSL)
$OpenBSD: patch-configure_in,v 1.2 2001/05/16 00:59:48 matt Exp $
--- configure.in.orig Tue Apr 17 01:44:30 2001
+++ configure.in Wed May 9 12:32:40 2001
@@ -123,9 +123,6 @@ AC_SUBST(WRAP32)
AC_SUBST(PICFLAG)
AC_SUBST(SHLIBEXT)
-# compile with optimization and without debugging by default
-CFLAGS="-O ${CFLAGS}"
-
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],
[if eval "test x$enable_debug = xyes"; then
CFLAGS="${CFLAGS} -g"
@@ -1707,45 +1704,47 @@ AC_MSG_CHECKING(whether to use SSL)
AC_ARG_WITH(ssl,
[ --with-ssl Include SSL support
--without-ssl Don't include SSL support (default)
@ -13,8 +23,8 @@ $OpenBSD: patch-configure_in,v 1.1 2001/04/10 11:36:15 brad Exp $
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SSL)
- withval="/usr/local/ssl" # default
+ sslinc="/usr/local/ssl/include" # default
+ ssllib="/usr/local/ssl/lib" # default
+ sslinc="/usr/local/ssl/include" #default
+ ssllib="/usr/local/ssl/lib" #default
if test "${with_sslinc+set}" = set; then
-
@ -25,7 +35,7 @@ $OpenBSD: patch-configure_in,v 1.1 2001/04/10 11:36:15 brad Exp $
- CFLAGS="-I/usr/local/ssl/include $CFLAGS"
- LIBS="-lssl -lcrypto $LIBS"
- LDFLAGS="=L/usr/local/ssl/lib $LDFLAGS"
+ AC_MSG_WARN(--with-sslinc called without argument - will use default)
+ AC_MSG_WARN(--with-sslinc called without argument - will use default)
;;
* )
- CFLAGS="-I${withval}/include $CFLAGS"

View File

@ -0,0 +1,138 @@
$OpenBSD: patch-tdb_c,v 1.1 2001/05/16 00:59:48 matt Exp $
This patch is in the Samba CVS tree. It should be included in Samba
2.2.1.
--- tdb/tdb.c.orig Sat Apr 14 02:41:18 2001
+++ tdb/tdb.c Fri May 11 11:37:15 2001
@@ -71,24 +71,24 @@ TDB_DATA tdb_null;
/* all contexts, to ensure no double-opens (fcntl locks don't nest!) */
static TDB_CONTEXT *tdbs = NULL;
-static void *tdb_munmap(void *ptr, tdb_len size)
+static void tdb_munmap(TDB_CONTEXT *tdb)
{
#ifdef HAVE_MMAP
- munmap(ptr, size);
+ if (tdb->map_ptr) munmap(tdb->map_ptr, tdb->map_size);
#endif
- return NULL;
+ tdb->map_ptr = NULL;
}
-static void *tdb_mmap(tdb_len size, int read_only, int fd)
+static void tdb_mmap(TDB_CONTEXT *tdb)
{
- void *ret = NULL;
#ifdef HAVE_MMAP
- ret = mmap(NULL, size, PROT_READ | (read_only ? 0 : PROT_WRITE), MAP_SHARED|MAP_FILE, fd, 0);
-
- if (ret == (void *)-1)
- ret = NULL;
+ if (!(tdb->flags & TDB_NOMMAP))
+ tdb->map_ptr = mmap(NULL, tdb->map_size,
+ PROT_READ|(tdb->read_only? 0:PROT_WRITE),
+ MAP_SHARED|MAP_FILE, tdb->fd, 0);
+#else
+ tdb->map_ptr = NULL;
#endif
- return ret;
}
/* Endian conversion: we only ever deal with 4 byte quantities */
@@ -203,10 +203,9 @@ static int tdb_oob(TDB_CONTEXT *tdb, tdb
if (st.st_size <= (size_t)offset) return TDB_ERRCODE(TDB_ERR_IO, -1);
/* Unmap, update size, remap */
- if (tdb->map_ptr) tdb->map_ptr=tdb_munmap(tdb->map_ptr, tdb->map_size);
+ tdb_munmap(tdb);
tdb->map_size = st.st_size;
- if (!(tdb->flags & TDB_NOMMAP))
- tdb->map_ptr = tdb_mmap(tdb->map_size, tdb->read_only,tdb->fd);
+ tdb_mmap(tdb);
return 0;
}
@@ -439,20 +438,37 @@ static int tdb_expand(TDB_CONTEXT *tdb,
the database up to a multiple of TDB_PAGE_SIZE */
size = TDB_ALIGN(tdb->map_size + size*10, TDB_PAGE_SIZE) - tdb->map_size;
- /* expand the file itself */
- if (!(tdb->flags & TDB_INTERNAL)) {
- lseek(tdb->fd, tdb->map_size + size - 1, SEEK_SET);
- if (write(tdb->fd, &b, 1) != 1) goto fail;
- }
+ if (!(tdb->flags & TDB_INTERNAL))
+ tdb_munmap(tdb);
- if (!(tdb->flags & TDB_INTERNAL) && tdb->map_ptr)
- tdb->map_ptr = tdb_munmap(tdb->map_ptr, tdb->map_size);
+ /*
+ * We must ensure the file is unmapped before doing this
+ * to ensure consistency with systems like OpenBSD where
+ * writes and mmaps are not consistent.
+ */
+
+ /* expand the file itself */
+ if (!(tdb->flags & TDB_INTERNAL)) {
+ if (lseek(tdb->fd, tdb->map_size + size - 1, SEEK_SET)!=tdb->map_size + size - 1)
+ goto fail;
+ if (write(tdb->fd, &b, 1) != 1)
+ goto fail;
+ }
tdb->map_size += size;
if (tdb->flags & TDB_INTERNAL)
tdb->map_ptr = realloc(tdb->map_ptr, tdb->map_size);
+ /*
+ * We must ensure the file is remapped before adding the space
+ * to ensure consistency with systems like OpenBSD where
+ * writes and mmaps are not consistent.
+ */
+
+ /* We're ok if the mmap fails as we'll fallback to read/write */
+ tdb_mmap(tdb);
+
/* form a new freelist record */
memset(&rec,'\0',sizeof(rec));
rec.rec_len = size - sizeof(rec);
@@ -461,9 +477,6 @@ static int tdb_expand(TDB_CONTEXT *tdb,
offset = tdb->map_size - size;
if (tdb_free(tdb, offset, &rec) == -1) goto fail;
- if (!(tdb->flags & TDB_NOMMAP))
- tdb->map_ptr = tdb_mmap(tdb->map_size, 0, tdb->fd);
-
tdb_unlock(tdb, -1, F_WRLCK);
return 0;
fail:
@@ -1135,8 +1148,7 @@ TDB_CONTEXT *tdb_open(char *name, int ha
tdb.inode = st.st_ino;
tdb.locked = calloc(tdb.header.hash_size+1, sizeof(tdb.locked[0]));
if (!tdb.locked) goto fail;
- if (!(tdb.flags & TDB_NOMMAP))
- tdb.map_ptr = tdb_mmap(st.st_size, tdb.read_only, tdb.fd);
+ tdb_mmap(&tdb);
if (locked) {
tdb_clear_spinlocks(&tdb);
tdb_brlock(&tdb, ACTIVE_LOCK, F_UNLCK, F_SETLK);
@@ -1155,7 +1167,7 @@ TDB_CONTEXT *tdb_open(char *name, int ha
fail:
if (tdb.name) free(tdb.name);
if (tdb.fd != -1) close(tdb.fd);
- if (tdb.map_ptr) tdb_munmap(tdb.map_ptr, tdb.map_size);
+ tdb_munmap(&tdb);
return NULL;
}
@@ -1167,7 +1179,7 @@ int tdb_close(TDB_CONTEXT *tdb)
if (tdb->map_ptr) {
if (tdb->flags & TDB_INTERNAL) free(tdb->map_ptr);
- else tdb_munmap(tdb->map_ptr, tdb->map_size);
+ else tdb_munmap(tdb);
}
if (tdb->name) free(tdb->name);
if (tdb->fd != -1) {

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2001/04/10 11:33:47 brad Exp $
bin/addtosmbpass
@comment $OpenBSD: PLIST,v 1.15 2001/05/16 00:59:48 matt Exp $
bin/convert_smbpasswd
bin/make_printerdef
bin/make_smbcodepage
@ -7,7 +6,9 @@ bin/make_unicodemap
bin/mksmbpasswd.sh
bin/nmblookup
bin/rpcclient
bin/smbcacls
bin/smbclient
bin/smbcontrol
bin/smbpasswd
bin/smbspool
bin/smbstatus
@ -20,6 +21,7 @@ lib/samba/codepages/codepage.737
lib/samba/codepages/codepage.775
lib/samba/codepages/codepage.850
lib/samba/codepages/codepage.852
lib/samba/codepages/codepage.857
lib/samba/codepages/codepage.861
lib/samba/codepages/codepage.866
lib/samba/codepages/codepage.932
@ -28,8 +30,10 @@ lib/samba/codepages/codepage.949
lib/samba/codepages/codepage.950
lib/samba/codepages/unicode_map.437
lib/samba/codepages/unicode_map.737
lib/samba/codepages/unicode_map.775
lib/samba/codepages/unicode_map.850
lib/samba/codepages/unicode_map.852
lib/samba/codepages/unicode_map.857
lib/samba/codepages/unicode_map.861
lib/samba/codepages/unicode_map.866
lib/samba/codepages/unicode_map.932
@ -37,20 +41,31 @@ lib/samba/codepages/unicode_map.936
lib/samba/codepages/unicode_map.949
lib/samba/codepages/unicode_map.950
lib/samba/codepages/unicode_map.ISO8859-1
lib/samba/codepages/unicode_map.ISO8859-13
lib/samba/codepages/unicode_map.ISO8859-15
lib/samba/codepages/unicode_map.ISO8859-2
lib/samba/codepages/unicode_map.ISO8859-5
lib/samba/codepages/unicode_map.ISO8859-7
lib/samba/codepages/unicode_map.ISO8859-9
lib/samba/codepages/unicode_map.KOI8-R
libexec/nmbd
libexec/smbd
libexec/swat
man/man1/findsmb.1
man/man1/make_smbcodepage.1
man/man1/make_unicodemap.1
man/man1/nmblookup.1
man/man1/rpcclient.1
man/man1/smbcacls.1
man/man1/smbclient.1
man/man1/smbcontrol.1
man/man1/smbrun.1
man/man1/smbsh.1
man/man1/smbstatus.1
man/man1/smbtar.1
man/man1/testparm.1
man/man1/testprns.1
man/man1/wbinfo.1
man/man5/lmhosts.5
man/man5/smb.conf.5
man/man5/smbpasswd.5
@ -63,9 +78,7 @@ man/man8/smbpasswd.8
man/man8/smbspool.8
man/man8/smbumount.8
man/man8/swat.8
sbin/nmbd
sbin/smbd
sbin/swat
man/man8/winbindd.8
share/doc/samba/NT4-Locking.reg
share/doc/samba/NT4_PlainPassword.reg
share/doc/samba/README
@ -75,6 +88,7 @@ share/doc/samba/Win2000_PlainPassword.reg
share/doc/samba/Win95_PlainPassword.reg
share/doc/samba/Win98_PlainPassword.reg
share/doc/samba/Win9X-CacheHandling.reg
share/doc/samba/WinME_PlainPassword.reg
share/doc/samba/WindowsTerminalServer.reg
share/doc/samba/announce
share/doc/samba/faq/Samba-Server-FAQ-1.html
@ -103,27 +117,20 @@ share/doc/samba/textdocs/Application_Serving.txt
share/doc/samba/textdocs/BROWSING-Config.txt
share/doc/samba/textdocs/BROWSING.txt
share/doc/samba/textdocs/BUGS.txt
share/doc/samba/textdocs/CRLF-LF-Conversions.txt
share/doc/samba/textdocs/CVS_ACCESS.txt
share/doc/samba/textdocs/DHCP-Server-Configuration.txt
share/doc/samba/textdocs/DIAGNOSIS.txt
share/doc/samba/textdocs/DNIX.txt
share/doc/samba/textdocs/DOMAIN.txt
share/doc/samba/textdocs/DOMAIN_CONTROL.txt
share/doc/samba/textdocs/DOMAIN_MEMBER.txt
share/doc/samba/textdocs/ENCRYPTION.txt
share/doc/samba/textdocs/Faxing.txt
share/doc/samba/textdocs/File-Cacheing.txt
share/doc/samba/textdocs/GOTCHAS.txt
share/doc/samba/textdocs/HINTS.txt
share/doc/samba/textdocs/INSTALL.sambatar
share/doc/samba/textdocs/Imprints.txt
share/doc/samba/textdocs/MIRRORS.txt
share/doc/samba/textdocs/Macintosh_Clients.txt
share/doc/samba/textdocs/NT-Guest-Access.txt
share/doc/samba/textdocs/NTDOMAIN.txt
share/doc/samba/textdocs/NT_Security.txt
share/doc/samba/textdocs/NetBIOS.txt
share/doc/samba/textdocs/OS2-Client-HOWTO.txt
share/doc/samba/textdocs/PRINTER_DRIVER.txt
share/doc/samba/textdocs/PROFILES.txt
share/doc/samba/textdocs/PROJECTS
@ -142,19 +149,32 @@ share/doc/samba/textdocs/Speed2.txt
share/doc/samba/textdocs/Support.txt
share/doc/samba/textdocs/Tracing.txt
share/doc/samba/textdocs/UNIX-SMB.txt
share/doc/samba/textdocs/UNIX_INSTALL.txt
share/doc/samba/textdocs/UNIX_SECURITY.txt
share/doc/samba/textdocs/Win95.txt
share/doc/samba/textdocs/WinNT.txt
share/doc/samba/textdocs/cifsntdomain.txt
share/doc/samba/textdocs/kurs.pdf
share/doc/samba/textdocs/kurs.tex
share/doc/samba/textdocs/logo.ps
share/doc/samba/textdocs/samba-pdc-faq.txt
share/doc/samba/textdocs/samba-pdc-howto.txt
share/doc/samba/textdocs/security_level.txt
share/doc/samba/textdocs/smbmount.txt
share/examples/samba/README
share/examples/samba/autofs/README
share/examples/samba/VFS/.cvsignore
share/examples/samba/VFS/Makefile
share/examples/samba/VFS/README
share/examples/samba/VFS/audit.c
share/examples/samba/VFS/skel.c
share/examples/samba/appliance/Makefile
share/examples/samba/appliance/README
share/examples/samba/appliance/appliance.spec
share/examples/samba/appliance/build.sh
share/examples/samba/appliance/smb.conf-appliance
share/examples/samba/autofs/auto.a
share/examples/samba/dce-dfs/README
share/examples/samba/dce-dfs/smb.conf
share/examples/samba/misc/extra_smbstatus
share/examples/samba/misc/swat.pl
share/examples/samba/misc/wall.perl
share/examples/samba/printer-accounting/README
share/examples/samba/printer-accounting/acct-all
@ -163,6 +183,7 @@ share/examples/samba/printer-accounting/hp5-redir
share/examples/samba/printer-accounting/lp-acct
share/examples/samba/printer-accounting/printcap
share/examples/samba/printing/smbprint
share/examples/samba/printing/smbprint.newer
share/examples/samba/printing/smbprint.sysv
share/examples/samba/simple/README
share/examples/samba/simple/smb.conf
@ -181,210 +202,222 @@ share/examples/samba/validchars/nwdos70.out
share/examples/samba/validchars/readme
share/examples/samba/validchars/validchr.c
share/examples/samba/validchars/validchr.com
share/examples/samba/wins_hook/README
share/examples/samba/wins_hook/dns_update
swat/help/DOMAIN_MEMBER.html
swat/help/NT_Security.html
swat/help/lmhosts.5.html
swat/help/make_smbcodepage.1.html
swat/help/make_unicodemap.1.html
swat/help/nmbd.8.html
swat/help/nmblookup.1.html
swat/help/samba.7.html
swat/help/smb.conf.5.html
swat/help/smbclient.1.html
swat/help/smbd.8.html
swat/help/smbmnt.8.html
swat/help/smbmount.8.html
swat/help/smbpasswd.5.html
swat/help/smbpasswd.8.html
swat/help/smbrun.1.html
swat/help/smbsh.1.html
swat/help/smbspool.8.html
swat/help/smbstatus.1.html
swat/help/smbtar.1.html
swat/help/swat.8.html
swat/help/testparm.1.html
swat/help/testprns.1.html
swat/help/welcome.html
swat/help/welcome.ja_JP.ujis.html
swat/images/globals.gif
swat/images/home.gif
swat/images/passwd.gif
swat/images/printers.gif
swat/images/samba.gif
swat/images/shares.gif
swat/images/status.gif
swat/images/viewconfig.gif
swat/include/footer.html
swat/include/header.html
swat/using_samba/appa_01.html
swat/using_samba/appa_02.html
swat/using_samba/appa_03.html
swat/using_samba/appa_04.html
swat/using_samba/appa_05.html
swat/using_samba/appb_01.html
swat/using_samba/appb_02.html
swat/using_samba/appb_03.html
swat/using_samba/appc_01.html
swat/using_samba/appd_01.html
swat/using_samba/appe_01.html
swat/using_samba/appf_01.html
swat/using_samba/ch01_01.html
swat/using_samba/ch01_02.html
swat/using_samba/ch01_03.html
swat/using_samba/ch01_04.html
swat/using_samba/ch01_05.html
swat/using_samba/ch01_06.html
swat/using_samba/ch01_07.html
swat/using_samba/ch01_08.html
swat/using_samba/ch02_01.html
swat/using_samba/ch02_02.html
swat/using_samba/ch02_03.html
swat/using_samba/ch02_04.html
swat/using_samba/ch02_05.html
swat/using_samba/ch02_06.html
swat/using_samba/ch03_01.html
swat/using_samba/ch03_02.html
swat/using_samba/ch03_03.html
swat/using_samba/ch04_01.html
swat/using_samba/ch04_02.html
swat/using_samba/ch04_03.html
swat/using_samba/ch04_04.html
swat/using_samba/ch04_05.html
swat/using_samba/ch04_06.html
swat/using_samba/ch04_07.html
swat/using_samba/ch04_08.html
swat/using_samba/ch05_01.html
swat/using_samba/ch05_02.html
swat/using_samba/ch05_03.html
swat/using_samba/ch05_04.html
swat/using_samba/ch05_05.html
swat/using_samba/ch06_01.html
swat/using_samba/ch06_02.html
swat/using_samba/ch06_03.html
swat/using_samba/ch06_04.html
swat/using_samba/ch06_05.html
swat/using_samba/ch06_06.html
swat/using_samba/ch07_01.html
swat/using_samba/ch07_02.html
swat/using_samba/ch07_03.html
swat/using_samba/ch08_01.html
swat/using_samba/ch08_02.html
swat/using_samba/ch08_03.html
swat/using_samba/ch08_04.html
swat/using_samba/ch08_05.html
swat/using_samba/ch08_06.html
swat/using_samba/ch08_07.html
swat/using_samba/ch09_01.html
swat/using_samba/ch09_02.html
swat/using_samba/ch09_03.html
swat/using_samba/figs/sam.0101.gif
swat/using_samba/figs/sam.0102.gif
swat/using_samba/figs/sam.0103.gif
swat/using_samba/figs/sam.0104.gif
swat/using_samba/figs/sam.0105.gif
swat/using_samba/figs/sam.0106.gif
swat/using_samba/figs/sam.0107.gif
swat/using_samba/figs/sam.0108.gif
swat/using_samba/figs/sam.0109.gif
swat/using_samba/figs/sam.0110.gif
swat/using_samba/figs/sam.0111.gif
swat/using_samba/figs/sam.0112.gif
swat/using_samba/figs/sam.0113.gif
swat/using_samba/figs/sam.0114.gif
swat/using_samba/figs/sam.0201.gif
swat/using_samba/figs/sam.0202.gif
swat/using_samba/figs/sam.0203.gif
swat/using_samba/figs/sam.0204.gif
swat/using_samba/figs/sam.0301.gif
swat/using_samba/figs/sam.0302.gif
swat/using_samba/figs/sam.0303.gif
swat/using_samba/figs/sam.0304.gif
swat/using_samba/figs/sam.0305.gif
swat/using_samba/figs/sam.0306.gif
swat/using_samba/figs/sam.0307.gif
swat/using_samba/figs/sam.0308.gif
swat/using_samba/figs/sam.0309.gif
swat/using_samba/figs/sam.0310.gif
swat/using_samba/figs/sam.0311.gif
swat/using_samba/figs/sam.0312.gif
swat/using_samba/figs/sam.0313.gif
swat/using_samba/figs/sam.0314.gif
swat/using_samba/figs/sam.0315.gif
swat/using_samba/figs/sam.0316.gif
swat/using_samba/figs/sam.0317.gif
swat/using_samba/figs/sam.0318.gif
swat/using_samba/figs/sam.0319.gif
swat/using_samba/figs/sam.0320.gif
swat/using_samba/figs/sam.0321.gif
swat/using_samba/figs/sam.0322.gif
swat/using_samba/figs/sam.0323.gif
swat/using_samba/figs/sam.0324.gif
swat/using_samba/figs/sam.0325.gif
swat/using_samba/figs/sam.0326.gif
swat/using_samba/figs/sam.0327.gif
swat/using_samba/figs/sam.0328.gif
swat/using_samba/figs/sam.0401.gif
swat/using_samba/figs/sam.0402.gif
swat/using_samba/figs/sam.0403.gif
swat/using_samba/figs/sam.0404.gif
swat/using_samba/figs/sam.0405.gif
swat/using_samba/figs/sam.0406.gif
swat/using_samba/figs/sam.0407.gif
swat/using_samba/figs/sam.0501.gif
swat/using_samba/figs/sam.0502.gif
swat/using_samba/figs/sam.0503.gif
swat/using_samba/figs/sam.0504.gif
swat/using_samba/figs/sam.0505.gif
swat/using_samba/figs/sam.0506.gif
swat/using_samba/figs/sam.0507.gif
swat/using_samba/figs/sam.0508.gif
swat/using_samba/figs/sam.0601.gif
swat/using_samba/figs/sam.0602.gif
swat/using_samba/figs/sam.0603.gif
swat/using_samba/figs/sam.0604.gif
swat/using_samba/figs/sam.0605.gif
swat/using_samba/figs/sam.0606.gif
swat/using_samba/figs/sam.0701.gif
swat/using_samba/figs/sam.0702.gif
swat/using_samba/figs/sam.0703.gif
swat/using_samba/figs/sam.0704.gif
swat/using_samba/figs/sam.0705.gif
swat/using_samba/figs/sam.0706.gif
swat/using_samba/figs/sam.0707.gif
swat/using_samba/figs/sam.0708.gif
swat/using_samba/figs/sam.0709.gif
swat/using_samba/figs/sam.0801.gif
swat/using_samba/figs/sam.0802.gif
swat/using_samba/figs/sam.0803.gif
swat/using_samba/figs/sam.0804.gif
swat/using_samba/figs/sam.0805.gif
swat/using_samba/figs/sam.0901.gif
swat/using_samba/figs/sam.0902.gif
swat/using_samba/figs/sam.0903.gif
swat/using_samba/figs/sam.0904.gif
swat/using_samba/figs/sam.0905.gif
swat/using_samba/figs/sam.aa01.gif
swat/using_samba/figs/sam.ab01.gif
swat/using_samba/figs/sam.ab02.gif
swat/using_samba/gifs/index.gif
swat/using_samba/gifs/samba.s.gif
swat/using_samba/gifs/txthome.gif
swat/using_samba/gifs/txtnexta.gif
swat/using_samba/gifs/txtpreva.gif
swat/using_samba/index.html
swat/using_samba/inx.html
swat/using_samba/licenseinfo.html
swat/using_samba/this_edition.html
@dirrm swat/using_samba/gifs
@dirrm swat/using_samba/figs
@dirrm swat/using_samba
@dirrm swat/include
@dirrm swat/images
@dirrm swat/help
@dirrm swat
@dirrm share/examples/samba/wins_hook
share/swat/help/DOMAIN_MEMBER.html
share/swat/help/ENCRYPTION.html
share/swat/help/NT_Security.html
share/swat/help/OS2-Client-HOWTO.html
share/swat/help/Samba-HOWTO-Collection.html
share/swat/help/Samba-PDC-HOWTO.html
share/swat/help/UNIX_INSTALL.html
share/swat/help/findsmb.1.html
share/swat/help/lmhosts.5.html
share/swat/help/make_smbcodepage.1.html
share/swat/help/msdfs_setup.html
share/swat/help/nmbd.8.html
share/swat/help/nmblookup.1.html
share/swat/help/printer_driver2.html
share/swat/help/rpcclient.1.html
share/swat/help/samba-pdc-faq.html
share/swat/help/samba-pdc-howto.html
share/swat/help/samba.7.html
share/swat/help/smb.conf.5.html
share/swat/help/smbcacls.1.html
share/swat/help/smbclient.1.html
share/swat/help/smbcontrol.1.html
share/swat/help/smbd.8.html
share/swat/help/smbmnt.8.html
share/swat/help/smbmount.8.html
share/swat/help/smbpasswd.5.html
share/swat/help/smbpasswd.8.html
share/swat/help/smbrun.1.html
share/swat/help/smbsh.1.html
share/swat/help/smbspool.8.html
share/swat/help/smbstatus.1.html
share/swat/help/smbtar.1.html
share/swat/help/smbumount.8.html
share/swat/help/swat.8.html
share/swat/help/testparm.1.html
share/swat/help/testprns.1.html
share/swat/help/wbinfo.1.html
share/swat/help/welcome.html
share/swat/help/winbind.html
share/swat/help/winbindd.8.html
share/swat/images/globals.gif
share/swat/images/home.gif
share/swat/images/passwd.gif
share/swat/images/printers.gif
share/swat/images/samba.gif
share/swat/images/shares.gif
share/swat/images/status.gif
share/swat/images/viewconfig.gif
share/swat/include/footer.html
share/swat/include/header.html
share/swat/using_samba/appa_01.html
share/swat/using_samba/appa_02.html
share/swat/using_samba/appa_03.html
share/swat/using_samba/appa_04.html
share/swat/using_samba/appa_05.html
share/swat/using_samba/appb_01.html
share/swat/using_samba/appb_02.html
share/swat/using_samba/appb_03.html
share/swat/using_samba/appc_01.html
share/swat/using_samba/appd_01.html
share/swat/using_samba/appe_01.html
share/swat/using_samba/appf_01.html
share/swat/using_samba/ch01_01.html
share/swat/using_samba/ch01_02.html
share/swat/using_samba/ch01_03.html
share/swat/using_samba/ch01_04.html
share/swat/using_samba/ch01_05.html
share/swat/using_samba/ch01_06.html
share/swat/using_samba/ch01_07.html
share/swat/using_samba/ch01_08.html
share/swat/using_samba/ch02_01.html
share/swat/using_samba/ch02_02.html
share/swat/using_samba/ch02_03.html
share/swat/using_samba/ch02_04.html
share/swat/using_samba/ch02_05.html
share/swat/using_samba/ch02_06.html
share/swat/using_samba/ch03_01.html
share/swat/using_samba/ch03_02.html
share/swat/using_samba/ch03_03.html
share/swat/using_samba/ch04_01.html
share/swat/using_samba/ch04_02.html
share/swat/using_samba/ch04_03.html
share/swat/using_samba/ch04_04.html
share/swat/using_samba/ch04_05.html
share/swat/using_samba/ch04_06.html
share/swat/using_samba/ch04_07.html
share/swat/using_samba/ch04_08.html
share/swat/using_samba/ch05_01.html
share/swat/using_samba/ch05_02.html
share/swat/using_samba/ch05_03.html
share/swat/using_samba/ch05_04.html
share/swat/using_samba/ch05_05.html
share/swat/using_samba/ch06_01.html
share/swat/using_samba/ch06_02.html
share/swat/using_samba/ch06_03.html
share/swat/using_samba/ch06_04.html
share/swat/using_samba/ch06_05.html
share/swat/using_samba/ch06_06.html
share/swat/using_samba/ch07_01.html
share/swat/using_samba/ch07_02.html
share/swat/using_samba/ch07_03.html
share/swat/using_samba/ch08_01.html
share/swat/using_samba/ch08_02.html
share/swat/using_samba/ch08_03.html
share/swat/using_samba/ch08_04.html
share/swat/using_samba/ch08_05.html
share/swat/using_samba/ch08_06.html
share/swat/using_samba/ch08_07.html
share/swat/using_samba/ch09_01.html
share/swat/using_samba/ch09_02.html
share/swat/using_samba/ch09_03.html
share/swat/using_samba/figs/sam.0101.gif
share/swat/using_samba/figs/sam.0102.gif
share/swat/using_samba/figs/sam.0103.gif
share/swat/using_samba/figs/sam.0104.gif
share/swat/using_samba/figs/sam.0105.gif
share/swat/using_samba/figs/sam.0106.gif
share/swat/using_samba/figs/sam.0107.gif
share/swat/using_samba/figs/sam.0108.gif
share/swat/using_samba/figs/sam.0109.gif
share/swat/using_samba/figs/sam.0110.gif
share/swat/using_samba/figs/sam.0111.gif
share/swat/using_samba/figs/sam.0112.gif
share/swat/using_samba/figs/sam.0113.gif
share/swat/using_samba/figs/sam.0114.gif
share/swat/using_samba/figs/sam.0201.gif
share/swat/using_samba/figs/sam.0202.gif
share/swat/using_samba/figs/sam.0203.gif
share/swat/using_samba/figs/sam.0204.gif
share/swat/using_samba/figs/sam.0301.gif
share/swat/using_samba/figs/sam.0302.gif
share/swat/using_samba/figs/sam.0303.gif
share/swat/using_samba/figs/sam.0304.gif
share/swat/using_samba/figs/sam.0305.gif
share/swat/using_samba/figs/sam.0306.gif
share/swat/using_samba/figs/sam.0307.gif
share/swat/using_samba/figs/sam.0308.gif
share/swat/using_samba/figs/sam.0309.gif
share/swat/using_samba/figs/sam.0310.gif
share/swat/using_samba/figs/sam.0311.gif
share/swat/using_samba/figs/sam.0312.gif
share/swat/using_samba/figs/sam.0313.gif
share/swat/using_samba/figs/sam.0314.gif
share/swat/using_samba/figs/sam.0315.gif
share/swat/using_samba/figs/sam.0316.gif
share/swat/using_samba/figs/sam.0317.gif
share/swat/using_samba/figs/sam.0318.gif
share/swat/using_samba/figs/sam.0319.gif
share/swat/using_samba/figs/sam.0320.gif
share/swat/using_samba/figs/sam.0321.gif
share/swat/using_samba/figs/sam.0322.gif
share/swat/using_samba/figs/sam.0323.gif
share/swat/using_samba/figs/sam.0324.gif
share/swat/using_samba/figs/sam.0325.gif
share/swat/using_samba/figs/sam.0326.gif
share/swat/using_samba/figs/sam.0327.gif
share/swat/using_samba/figs/sam.0328.gif
share/swat/using_samba/figs/sam.0401.gif
share/swat/using_samba/figs/sam.0402.gif
share/swat/using_samba/figs/sam.0403.gif
share/swat/using_samba/figs/sam.0404.gif
share/swat/using_samba/figs/sam.0405.gif
share/swat/using_samba/figs/sam.0406.gif
share/swat/using_samba/figs/sam.0407.gif
share/swat/using_samba/figs/sam.0501.gif
share/swat/using_samba/figs/sam.0502.gif
share/swat/using_samba/figs/sam.0503.gif
share/swat/using_samba/figs/sam.0504.gif
share/swat/using_samba/figs/sam.0505.gif
share/swat/using_samba/figs/sam.0506.gif
share/swat/using_samba/figs/sam.0507.gif
share/swat/using_samba/figs/sam.0508.gif
share/swat/using_samba/figs/sam.0601.gif
share/swat/using_samba/figs/sam.0602.gif
share/swat/using_samba/figs/sam.0603.gif
share/swat/using_samba/figs/sam.0604.gif
share/swat/using_samba/figs/sam.0605.gif
share/swat/using_samba/figs/sam.0606.gif
share/swat/using_samba/figs/sam.0701.gif
share/swat/using_samba/figs/sam.0702.gif
share/swat/using_samba/figs/sam.0703.gif
share/swat/using_samba/figs/sam.0704.gif
share/swat/using_samba/figs/sam.0705.gif
share/swat/using_samba/figs/sam.0706.gif
share/swat/using_samba/figs/sam.0707.gif
share/swat/using_samba/figs/sam.0708.gif
share/swat/using_samba/figs/sam.0709.gif
share/swat/using_samba/figs/sam.0801.gif
share/swat/using_samba/figs/sam.0802.gif
share/swat/using_samba/figs/sam.0803.gif
share/swat/using_samba/figs/sam.0804.gif
share/swat/using_samba/figs/sam.0805.gif
share/swat/using_samba/figs/sam.0901.gif
share/swat/using_samba/figs/sam.0902.gif
share/swat/using_samba/figs/sam.0903.gif
share/swat/using_samba/figs/sam.0904.gif
share/swat/using_samba/figs/sam.0905.gif
share/swat/using_samba/figs/sam.aa01.gif
share/swat/using_samba/figs/sam.ab01.gif
share/swat/using_samba/figs/sam.ab02.gif
share/swat/using_samba/gifs/index.gif
share/swat/using_samba/gifs/samba.s.gif
share/swat/using_samba/gifs/txthome.gif
share/swat/using_samba/gifs/txtnexta.gif
share/swat/using_samba/gifs/txtpreva.gif
share/swat/using_samba/index.html
share/swat/using_samba/inx.html
share/swat/using_samba/licenseinfo.html
share/swat/using_samba/this_edition.html
@dirrm share/swat/using_samba/gifs
@dirrm share/swat/using_samba/figs
@dirrm share/swat/using_samba
@dirrm share/swat/include
@dirrm share/swat/images
@dirrm share/swat/help
@dirrm share/swat
@dirrm share/examples/samba/validchars
@dirrm share/examples/samba/tridge
@dirrm share/examples/samba/thoralf
@ -395,6 +428,8 @@ swat/using_samba/this_edition.html
@dirrm share/examples/samba/misc
@dirrm share/examples/samba/dce-dfs
@dirrm share/examples/samba/autofs
@dirrm share/examples/samba/appliance
@dirrm share/examples/samba/VFS
@dirrm share/examples/samba
@dirrm share/doc/samba/textdocs
@dirrm share/doc/samba/faq

View File

@ -1,39 +1,6 @@
cursory examination done by andrew@creep.net 18 Mar 1999
mktemp() used in lib/util.c by smbd_mktemp(), which is used by smbd/reply.c
(passed to open_file_shared(), calls open() with O_CREAT|O_EXCL).
./smbd/reply.c:1726: pstrcpy(fname2,(char *)mktemp(fname));
Apart from that, mkstemp() is used (HAVE_SECURE_MKSTEMP is defined).
ok - passed to open_file_shared() (./smbd/open.c:765) with
FILE_CREATE_IF_NOT_EXIST|FILE_EXISTS_FAIL which results in open()
being called with O_CREAT|O_EXCL
./smbd/reply.c:2881: pstrcpy(fname2,(char *)mktemp(fname));
ok - passed to open_file_shared() (./smbd/open.c:765) with
FILE_CREATE_IF_NOT_EXIST|FILE_EXISTS_FAIL which results in open()
being called with O_CREAT|O_EXCL
./smbd/message.c:57: fstrcpy(name,(char *)mktemp(s));
ok - the file is open()d with O_CREAT|O_EXCL
./smbd/filename.c:419: pstrcpy(name,(char *)mktemp(name2));
?? - I wasn't able to tell where/if this was called from when the
conn->printer member would != 0, so I don't know what was done
with the returned name, if anything. It's possible, though unlikely,
that there is a race in a caller of unix_convert().
./smbwrapper/shared.c:40: fstrcpy(name,(char *)mktemp(s));
ok - the file is open()d with O_CREAT|O_EXCL
Also while investigating what I thought was a bug I found some behavior
that I consider undesirable:
When a non-root user executes smbpasswd to change their password,
it makes a connection to smbd, instead of having smbpasswd be suid
root so it can modify the file. This is fine, but the problem is
that in order for it to work you must have enabled anonymous
access to smbd. This seems to be intentional (see the code and
comment at libsmb/passchange.c:74) but it would be better to fix
smbd so that this is not necessary.
setreuid() and setregid() used by lib/util_sec.c.