summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-03-25 12:27:09 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-03-25 12:27:09 +0000
commite520d4be5e30c7dcbabbed7438079dc5805a13a0 (patch)
tree47b8d9e798bed2cf7290e3eac266745bec1389e6
parent49871190206ea4fc693f4f346c09cf0c838df072 (diff)
downloadsamba-e520d4be5e30c7dcbabbed7438079dc5805a13a0.tar.gz
samba-e520d4be5e30c7dcbabbed7438079dc5805a13a0.tar.bz2
samba-e520d4be5e30c7dcbabbed7438079dc5805a13a0.zip
Print list of builtin modules in 'smbd -b'
(This used to be commit 3a2ed0da40c9709cdae061927f44a38f58e44df0)
-rw-r--r--source3/aclocal.m41
-rw-r--r--source3/configure.in2
-rw-r--r--source3/smbd/build_options.c3
3 files changed, 6 insertions, 0 deletions
diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 5d9070fcd9..744acf6a1b 100644
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -55,6 +55,7 @@ AC_DEFUN(SMB_MODULE,
AC_MSG_RESULT([shared])
elif test x"$DEST" = xSTATIC; then
[init_static_modules_]translit([$4], [A-Z], [a-z])="$[init_static_modules_]translit([$4], [A-Z], [a-z]) $1_init();"
+ string_static_modules="$string_static_modules $1"
$4_STATIC="$$4_STATIC $2"
AC_SUBST($4_STATIC)
AC_MSG_RESULT([static])
diff --git a/source3/configure.in b/source3/configure.in
index 4a1ed3ab4b..a6d078c8ce 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3398,6 +3398,8 @@ SMB_MODULE(auth_domain, auth/auth_domain.o, bin/domain.so, AUTH)
SMB_MODULE(auth_builtin, auth/auth_builtin.o, bin/builtin.so, AUTH)
SMB_SUBSYSTEM(AUTH)
+AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
+
#################################################
# do extra things if we are running insure
diff --git a/source3/smbd/build_options.c b/source3/smbd/build_options.c
index bedfb5ef73..43335666a6 100644
--- a/source3/smbd/build_options.c
+++ b/source3/smbd/build_options.c
@@ -523,6 +523,9 @@ void build_options(BOOL screen)
output(screen," sizeof(uint32): %d\n",sizeof(uint32));
output(screen," sizeof(short): %d\n",sizeof(short));
output(screen," sizeof(void*): %d\n",sizeof(void*));
+
+ output(screen,"\nBuiltin modules:\n");
+ output(screen,"%s\n", STRING_STATIC_MODULES);
}