1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

Deal with subsystems with no settings, several other minor fixes.

(This used to be commit 10cf48591e)
This commit is contained in:
Jelmer Vernooij 2008-03-04 01:37:18 +01:00
parent e018501ca8
commit a69acf7cb9
7 changed files with 13 additions and 9 deletions

View File

@ -216,6 +216,9 @@ sub run_config_mk($$$$)
{
$section = $1;
$infragment = 0;
$result->{$section}{EXISTS}{KEY} = "EXISTS";
$result->{$section}{EXISTS}{VAL} = 1;
next;
}
@ -273,6 +276,7 @@ sub run_config_mk($$$$)
$input->{$name}{BASEDIR} = $basedir;
foreach my $key (values %{$result->{$section}}) {
next if ($key->{KEY} eq "EXISTS");
$key->{VAL} = smb_build::input::strtrim($key->{VAL});
my $vartype = $sectype->{$key->{KEY}};
if (not defined($vartype)) {

View File

@ -2,13 +2,13 @@
[SUBSYSTEM::brlock_ctdb]
PUBLIC_DEPENDENCIES = ctdb
brlock_ctdb_OBJ_FILES = brlock_ctdb.o
brlock_ctdb_OBJ_FILES = cluster/ctdb/brlock_ctdb.o
##################
[SUBSYSTEM::opendb_ctdb]
PUBLIC_DEPENDENCIES = ctdb
opendb_ctdb_OBJ_FILES = opendb_ctdb.o
opendb_ctdb_OBJ_FILES = cluster/ctdb/opendb_ctdb.o
##################
[SUBSYSTEM::ctdb]

View File

@ -268,7 +268,7 @@ SUBSYSTEM = LIBLDB
# End MODULE ldb_subtree_rename
################################################
ldb_subtree_delete_OBJ_FILES = subtree_delete.o
ldb_subtree_delete_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_delete.o
################################################
# Start MODULE ldb_linked_attributes

View File

@ -11,4 +11,4 @@ lib/policy/parse_adm.h: lib/policy/parse_adm.c
[BINARY::dumpadm]
PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
dumpadmin_OBJ_FILES = lib/policy/dumpadm.o
dumpadm_OBJ_FILES = lib/policy/dumpadm.o

View File

@ -708,7 +708,7 @@ RPC_EJS_IRPC_OBJ_FILES = librpc/gen_ndr/ndr_irpc_ejs.o
SWIG_FILE = rpc/dcerpc.i
PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
swig_dcerpc_OBJ_FILES = librpc/dcerpc_wrap.o
swig_dcerpc_OBJ_FILES = librpc/rpc/dcerpc_wrap.o
[PYTHON::python_echo]
PRIVATE_DEPENDENCIES = RPC_NDR_ECHO

View File

@ -21,6 +21,6 @@ PUBLIC_DEPENDENCIES = DCERPC_COMMON
# End SUBSYSTEM ntptr
################################################
NTPTR_OBJ_FILES = \
ntptr_base.o \
ntptr_interface.o
ntptr_OBJ_FILES = \
ntptr/ntptr_base.o \
ntptr/ntptr_interface.o

View File

@ -7,5 +7,5 @@ PRIVATE_DEPENDENCIES = brlock_ctdb opendb_ctdb
# End LIBRARY ntvfs_common
################################################
NTVFS_COMMON_OBJ_FILES = $(addprefix ntvfs/common/, init.o brlock.o brlock_tdb.o opendb.o opendb_tdb.o notify.o)
ntvfs_common_OBJ_FILES = $(addprefix ntvfs/common/, init.o brlock.o brlock_tdb.o opendb.o opendb_tdb.o notify.o)