diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-04-15 09:54:41 +0200 |
| commit | b967afca648eea481e586f367f99464418cf8468 (patch) | |
| tree | 3fbe9cc92a21013cbd1eb2b6fa1b73ccddfbb151 /source4/ntptr | |
| parent | 9cd04363f56ba5ee4f8b1ffaf662fe81cc995e99 (diff) | |
| parent | afaba23131dc079be3cd92e87495ec8b2ebdc4ae (diff) | |
| download | samba-b967afca648eea481e586f367f99464418cf8468.tar.gz samba-b967afca648eea481e586f367f99464418cf8468.tar.bz2 samba-b967afca648eea481e586f367f99464418cf8468.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e891157b4ec7b2f845fb20c4106d80bf169f2072)
Diffstat (limited to 'source4/ntptr')
| -rw-r--r-- | source4/ntptr/config.mk | 11 | ||||
| -rw-r--r-- | source4/ntptr/ntptr_base.c | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk index 4c1f46ff17..dda4c29444 100644 --- a/source4/ntptr/config.mk +++ b/source4/ntptr/config.mk @@ -5,21 +5,22 @@ [MODULE::ntptr_simple_ldb] INIT_FUNCTION = ntptr_simple_ldb_init SUBSYSTEM = ntptr -OBJ_FILES = \ - simple_ldb/ntptr_simple_ldb.o PRIVATE_DEPENDENCIES = \ LIBLDB NDR_SPOOLSS DCERPC_COMMON # End MODULE ntptr_simple_ldb ################################################ +ntptr_simple_ldb_OBJ_FILES = ntptr/simple_ldb/ntptr_simple_ldb.o + ################################################ # Start SUBSYSTEM ntptr [SUBSYSTEM::ntptr] PRIVATE_PROTO_HEADER = ntptr_proto.h -OBJ_FILES = \ - ntptr_base.o \ - ntptr_interface.o PUBLIC_DEPENDENCIES = DCERPC_COMMON # # End SUBSYSTEM ntptr ################################################ + +ntptr_OBJ_FILES = \ + ntptr/ntptr_base.o \ + ntptr/ntptr_interface.o diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c index 26e192d64b..0000337cb0 100644 --- a/source4/ntptr/ntptr_base.c +++ b/source4/ntptr/ntptr_base.c @@ -71,6 +71,7 @@ NTSTATUS ntptr_register(const void *_ops) NTSTATUS ntptr_init(struct loadparm_context *lp_ctx) { + extern NTSTATUS ntptr_simple_ldb_init(void); init_module_fn static_init[] = { STATIC_ntptr_MODULES }; init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "ntptr"); |