[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2477-gb5e894c

[Michael Adam]

The branch, v3-2-test has been updated
       via  b5e894cb3b4d447bd8e8c3f461508c4cf3f630c1 (commit)
       via  310c121faf5effeca9ab0df3591c486dd4982749 (commit)
       via  011f24c6c95c92417d877886ad87d2a2dd82056e (commit)
      from  d9b72282c63b57c8e54131306b2a3028a1ea41dc (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit b5e894cb3b4d447bd8e8c3f461508c4cf3f630c1
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 21 00:34:16 2008 +0100

    Remove check for secure mkstemp from configure.in.
    
    It has moved to libreplace.
    
    Michael

commit 310c121faf5effeca9ab0df3591c486dd4982749
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 21 00:11:03 2008 +0100

    Remove mmap check from configure.in
    
    It is available in libreplace.
    
    Michael

commit 011f24c6c95c92417d877886ad87d2a2dd82056e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Feb 21 10:26:54 2008 +0100

    Fix the build on irix: Prevent empty line in TDB_OBJ
    
    This leads to a Makfile syntax error in the prerequisites for
    bin/smbd. Wow, irix is really picky!
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in         |    4 +-
 source/configure.in        |   29 ------------------
 source/tests/shared_mmap.c |   68 --------------------------------------------
 3 files changed, 2 insertions(+), 99 deletions(-)
 delete mode 100644 source/tests/shared_mmap.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 5c0b73a..dce448d 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -242,8 +242,8 @@ LIBTDB_OBJ0 = @TDB_OBJS@
 LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
 TDB_OBJ = lib/util_tdb.o \
-	  lib/dbwrap.o lib/dbwrap_tdb.o lib/dbwrap_ctdb.o lib/dbwrap_rbt.o \
-	  @LIBTDB_STATIC@
+	  lib/dbwrap.o lib/dbwrap_tdb.o lib/dbwrap_ctdb.o \
+	  lib/dbwrap_rbt.o @LIBTDB_STATIC@
 
 SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
 
diff --git a/source/configure.in b/source/configure.in
index fe9d716..dcd083f 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -2615,28 +2615,6 @@ if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then
     AC_DEFINE(HAVE_BROKEN_GETGROUPS,1,[Whether getgroups is broken])
 fi
 
-AC_CACHE_CHECK([for secure mkstemp],samba_cv_HAVE_SECURE_MKSTEMP,[
-AC_TRY_RUN([#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-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,1,[Whether mkstemp is secure])
-fi
-
 AC_CACHE_CHECK([for broken readdir],samba_cv_HAVE_BROKEN_READDIR,[
 	AC_TRY_RUN([#include "${srcdir-.}/tests/os2_delete.c"],
 		[samba_cv_HAVE_BROKEN_READDIR=no],
@@ -2756,13 +2734,6 @@ if test x"$samba_cv_DARWIN_INITGROUPS" = x"yes" ; then
 	[Whether to use the Darwin-specific initgroups system call])
 fi
 
-AC_CACHE_CHECK([for working mmap],samba_cv_HAVE_MMAP,[
-AC_TRY_RUN([#include "${srcdir-.}/tests/shared_mmap.c"],
-           samba_cv_HAVE_MMAP=yes,samba_cv_HAVE_MMAP=no,samba_cv_HAVE_MMAP=cross)])
-if test x"$samba_cv_HAVE_MMAP" = x"yes"; then
-    AC_DEFINE(HAVE_MMAP,1,[Whether mmap works])
-fi
-
 AC_CACHE_CHECK([for fcntl locking],samba_cv_HAVE_FCNTL_LOCK,[
 AC_TRY_RUN([#include "${srcdir-.}/tests/fcntl_lock.c"],
            samba_cv_HAVE_FCNTL_LOCK=yes,samba_cv_HAVE_FCNTL_LOCK=no,samba_cv_HAVE_FCNTL_LOCK=cross)])
diff --git a/source/tests/shared_mmap.c b/source/tests/shared_mmap.c
deleted file mode 100644
index fcef75d..0000000
--- a/source/tests/shared_mmap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* this tests whether we can use a shared writeable mmap on a file -
-   as needed for the mmap varient of FAST_SHARE_MODES */
-
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#define DATA "conftest.mmap"
-
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
-main()
-{
-	int *buf;
-	int i; 
-	int fd = open(DATA,O_RDWR|O_CREAT|O_TRUNC,0666);
-	int count=7;
-
-	if (fd == -1) exit(1);
-
-	for (i=0;i<10000;i++) {
-		write(fd,&i,sizeof(i));
-	}
-
-	close(fd);
-
-	if (fork() == 0) {
-		fd = open(DATA,O_RDWR);
-		if (fd == -1) exit(1);
-
-		buf = (int *)mmap(NULL, 10000*sizeof(int), 
-				   (PROT_READ | PROT_WRITE), 
-				   MAP_FILE | MAP_SHARED, 
-				   fd, 0);
-
-		while (count-- && buf[9124] != 55732) sleep(1);
-
-		if (count <= 0) exit(1);
-
-		buf[1763] = 7268;
-		exit(0);
-	}
-
-	fd = open(DATA,O_RDWR);
-	if (fd == -1) exit(1);
-
-	buf = (int *)mmap(NULL, 10000*sizeof(int), 
-			   (PROT_READ | PROT_WRITE), 
-			   MAP_FILE | MAP_SHARED, 
-			   fd, 0);
-
-	if (buf == (int *)-1) exit(1);
-
-	buf[9124] = 55732;
-
-	while (count-- && buf[1763] != 7268) sleep(1);
-
-	unlink(DATA);
-		
-	if (count > 0) exit(0);
-	exit(1);
-}


-- 
Samba Shared Repository