[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-2139-g18c340b
Stefan Metzmacher
metze at samba.org
Mon Jun 8 11:21:09 GMT 2009
The branch, master has been updated
via 18c340b9247a6884588ce501cdf259aa74036bfd (commit)
via ef9773c8e77346bd0d52a827b0f9a1b0e3b4ccfd (commit)
via a7cd66728b4b35dbb7686108bcf8e100d663aad7 (commit)
via 96eaa412e63847c1cb942ed220607350c6b20a95 (commit)
via ab88f9017c977af3bb669a638f77552defff3fbf (commit)
via 16f5aedea0cd05113b5fbed06e140d7fedbad095 (commit)
via 40178dd81e829878bbc7dcbb51184f747421e84b (commit)
via 11332e106c8654f798177e089b332263bfb81e18 (commit)
via c41a12f8ba75f0d3fce336ee1f779391782413db (commit)
from 029e8e6314e4d13dd5321f6b0a3f761918a40f64 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 18c340b9247a6884588ce501cdf259aa74036bfd
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jun 8 11:51:36 2009 +0200
s3:Makefile.in: use LIBDL as make variable instead of a shell variable
metze
commit ef9773c8e77346bd0d52a827b0f9a1b0e3b4ccfd
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 17:05:23 2009 +0000
Fix make test_pam_modules
In Samba3 there is a very handy Makefile target 'test_pam_modules'. It let
quickly veryfy, that obtained PAM module actually is loadable and doesn't
miss any dependency libs. the only problem that on FreeBSD it doesn't work
OOTB, as it unconditionally adds -ldl to the list of libraries when FreeBSD
doesn't have it and doesn't need it.
This small patch fixes the problem for FreeBSD and, I hope, still valid
for othe systems, where -ldl is required. Has to be tested there though.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit a7cd66728b4b35dbb7686108bcf8e100d663aad7
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 14:16:51 2009 +0000
Small fix to SMB_LIBRARY macro
It seems, that SMB_LIBRARY macro has small bug in the logic, when showing
if shall the SHARED version of the library be build.
If the default value is given as a parameter, it reports "yes" when library
is going to be build(?).
This small patch makes report consistent.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 96eaa412e63847c1cb942ed220607350c6b20a95
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 15:46:07 2009 +0000
SIGRTMIN additions
In addition to [FreeBSD 14] there is another place, where we (re)define
SIGRTMIN - in SMB_IF_RTSIGNAL_BUG macro in /source3/m4/aclocal.m4.
Here is another small patch.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit ab88f9017c977af3bb669a638f77552defff3fbf
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 13:58:38 2009 +0000
Set SIGRTMIN to NSIG
In the includes we define SIGRTMIN to 32 if it's not defined already. This
value could be fairly low and it's better to use NSIG(number of defined
signals) as the lower mark for the available signals.
We have similar defenition in the source3/smbd/aio.c, which can be safely
removed, as it comes from includes.h then.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 16f5aedea0cd05113b5fbed06e140d7fedbad095
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 12:50:15 2009 +0000
Check for dmalloc at the end of the configure
Enabling dmalloc in Samba3 build leads to the wrong detection of the
strndup() function - there isn't one in FreeBSD prior to 7.2, but
dmalloc defines it, so, farther tests with -ldmalloc added wrongly
find it. the cheapest fix is to move dmalloc detection and inclusion
to the bottom of configure, so it can't affect detection of the system
capabilities.
Here is the patch.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 40178dd81e829878bbc7dcbb51184f747421e84b
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 12:39:22 2009 +0000
Add langinfo.h to the system/locale.h
This patch for Samba4. It's not really inspired by any real need, just
for the consistency. We define replace/system/locale.h as a generic
header, that includes all locale related headers and we are using
nl_langinfo at least in Samba3. So, it would be consistent to add yet
another locale-related header to the set of locale.h headers.
Here is the patch.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 11332e106c8654f798177e089b332263bfb81e18
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 12:34:54 2009 +0000
Make tunable for modulesdir
This patch is for Samba4. It adds configure tunable for modulesdir -
location, where modules should be installed. In the case, when no
FHS compliance is used and libdir is redefined, modulesdir still
points to $PREFIX/modules. In some installations it may be not desired.
I'd rather set it myself :)
So, here is the patch.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit c41a12f8ba75f0d3fce336ee1f779391782413db
Author: Timur I. Bakeyev <timur at com.bat.ru>
Date: Sun Jun 7 12:00:22 2009 +0000
rl_event_hook detection
This patch is relevant for Samba4 source mostly. The way, how readline
compiled under FreeBSD makes it require stdio.h to get all the necessary
declarations. Without this addition rl_event_hook is not properly detected.
With regards,
Timur Bakeyev.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/replace/system/config.m4 | 2 +-
lib/replace/system/locale.h | 4 ++++
source3/Makefile.in | 3 ++-
source3/configure.in | 20 ++++++++++----------
source3/include/includes.h | 2 +-
source3/m4/aclocal.m4 | 7 +++++--
source3/script/tests/dlopen.sh | 2 +-
source3/smbd/aio.c | 3 ---
source4/build/m4/check_path.m4 | 16 ++++++++++++++++
source4/lib/smbreadline/readline.m4 | 5 ++++-
10 files changed, 44 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index e219658..39c2f58 100644
--- a/lib/replace/system/config.m4
+++ b/lib/replace/system/config.m4
@@ -119,7 +119,7 @@ AC_VERIFY_C_PROTOTYPE([struct group *getgrent_r(struct group *src, char *buf, si
AC_CHECK_FUNCS(getgrouplist)
# locale
-AC_CHECK_HEADERS(ctype.h locale.h)
+AC_CHECK_HEADERS(ctype.h locale.h langinfo.h)
# glob
AC_CHECK_HEADERS(fnmatch.h)
diff --git a/lib/replace/system/locale.h b/lib/replace/system/locale.h
index e73a9bb..504a3bb 100644
--- a/lib/replace/system/locale.h
+++ b/lib/replace/system/locale.h
@@ -35,4 +35,8 @@
#include <locale.h>
#endif
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#endif
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f54fa6b..1a3c8ef 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -53,6 +53,7 @@ AWK=@AWK@
PICFLAG=@PICFLAG@
DYNEXP=@DYNEXP@
PERL=@PERL@
+LIBDL=@LIBDL@
PIDL_ARGS=@PIDL_ARGS@
@@ -3164,7 +3165,7 @@ test_pam_modules:: pam_modules
@$(LIB_PATH_VAR)=./bin && \
export $(LIB_PATH_VAR) && \
for module in $(PAM_MODULES); do \
- ./script/tests/dlopen.sh -lpam -ldl bin/$${module}. at SHLIBEXT@ \
+ ./script/tests/dlopen.sh -lpam $(LIBDL) bin/$${module}. at SHLIBEXT@ \
|| exit 1; \
done
diff --git a/source3/configure.in b/source3/configure.in
index bbd40db..5ea214b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -216,16 +216,6 @@ if test x"$ac_cv_prog_gcc" = x"yes" ; then
fi
fi
-AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
-
-if test "x$enable_dmalloc" = xyes
-then
- AC_DEFINE(ENABLE_DMALLOC, 1, [Define to turn on dmalloc debugging])
- AC_DEFINE(DMALLOC_FUNC_CHECK, 1,
- [Define to check invariants around some common functions])
- LIBS="$LIBS -ldmalloc"
-fi
-
#################################################
# check for a shared memory profiling support
AC_MSG_CHECKING(whether to use profiling)
@@ -6459,6 +6449,16 @@ AC_ZLIB([ZLIB_OBJS=""], [
CFLAGS="-I../lib/zlib $CFLAGS"
])
+AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
+
+if test "x$enable_dmalloc" = xyes
+then
+ AC_DEFINE(ENABLE_DMALLOC, 1, [Define to turn on dmalloc debugging])
+ AC_DEFINE(DMALLOC_FUNC_CHECK, 1,
+ [Define to check invariants around some common functions])
+ LIBS="$LIBS -ldmalloc"
+fi
+
dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
LIB_REMOVE_USR_LIB(LDFLAGS)
LIB_REMOVE_USR_LIB(LIBS)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 3ce63bb..b7ba703 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -795,7 +795,7 @@ enum flush_reason_enum {
#endif
#ifndef SIGRTMIN
-#define SIGRTMIN 32
+#define SIGRTMIN NSIG
#endif
#ifndef MAP_FILE
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index c792057..3b120e2 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -99,14 +99,14 @@ case "$withval" in
build_lib=yes
;;
*)
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(no)
build_lib=no
;;
esac
],
[
# if unspecified, default is not to build
-AC_MSG_RESULT(yes)
+AC_MSG_RESULT(no)
build_lib=no
]
)
@@ -828,6 +828,9 @@ AC_DEFUN([SMB_IF_RTSIGNAL_BUG],
#include <fcntl.h>
#include <signal.h>
+#ifndef SIGRTMIN
+#define SIGRTMIN NSIG
+#endif
/* from smbd/notify_kernel.c */
#ifndef RT_SIGNAL_NOTIFY
#define RT_SIGNAL_NOTIFY (SIGRTMIN+2)
diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh
index edf4471..6412bc5 100755
--- a/source3/script/tests/dlopen.sh
+++ b/source3/script/tests/dlopen.sh
@@ -67,7 +67,7 @@ for arg in $@ ; do
esac
done
-${CC:-gcc} $RPM_OPT_FLAGS $CFLAGS -o $tempdir/dlopen $cflags $tempdir/dlopen.c $ldflags -ldl
+${CC:-gcc} $RPM_OPT_FLAGS $CFLAGS -o $tempdir/dlopen $cflags $tempdir/dlopen.c $ldflags
retval=0
for module in $modules ; do
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index a5eea0a..c6f700f 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -25,9 +25,6 @@
/* The signal we'll use to signify aio done. */
#ifndef RT_SIGNAL_AIO
-#ifndef SIGRTMIN
-#define SIGRTMIN NSIG
-#endif
#define RT_SIGNAL_AIO (SIGRTMIN+3)
#endif
diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 1751a89..08a304b 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -49,6 +49,22 @@ else
fi
#################################################
+# set modules directory location
+AC_ARG_WITH(modulesdir,
+[AS_HELP_STRING([--with-modulesdir=DIR],[Where to put dynamically loadable modules ($modulesdir)])],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+ AC_MSG_WARN([--with-modulesdir called without argument - will use default])
+ ;;
+ * )
+ modulesdir="$withval"
+ ;;
+ esac])
+
+#################################################
# set private directory location
AC_ARG_WITH(privatedir,
[AS_HELP_STRING([--with-privatedir=DIR],[Where to put sam.ldb and other private files containing key material ($ac_default_prefix/private)])],
diff --git a/source4/lib/smbreadline/readline.m4 b/source4/lib/smbreadline/readline.m4
index 86e2fb1..df15440 100644
--- a/source4/lib/smbreadline/readline.m4
+++ b/source4/lib/smbreadline/readline.m4
@@ -69,7 +69,10 @@ AC_CHECK_LIB(readline, rl_completion_matches,
[$TERMLIBS])
# not all readline libs have rl_event_hook or history_list
-AC_CHECK_DECLS(rl_event_hook, [], [], [#include <readline/readline.h>])
+AC_CHECK_DECLS(rl_event_hook, [], [], [
+ #include <stdio.h>
+ #include <readline/readline.h>
+])
AC_CHECK_LIB(readline, history_list,
[AC_DEFINE(HAVE_HISTORY_LIST, 1, [Do we have history_list?])],
[],
--
Samba Shared Repository
More information about the samba-cvs
mailing list