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/cldap_server | |
| 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/cldap_server')
| -rw-r--r-- | source4/cldap_server/config.mk | 10 | ||||
| -rw-r--r-- | source4/cldap_server/netlogon.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk index 9dd3758e7a..c10cf57b5b 100644 --- a/source4/cldap_server/config.mk +++ b/source4/cldap_server/config.mk @@ -6,11 +6,13 @@ INIT_FUNCTION = server_service_cldapd_init SUBSYSTEM = service PRIVATE_PROTO_HEADER = proto.h -OBJ_FILES = \ - cldap_server.o \ - netlogon.o \ - rootdse.o PRIVATE_DEPENDENCIES = \ LIBCLI_CLDAP LIBNETIF process_model # End SUBSYSTEM CLDAPD ####################### + +CLDAPD_OBJ_FILES = $(addprefix cldap_server/, \ + cldap_server.o \ + netlogon.o \ + rootdse.o) + diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index 32a71e43af..a524a6f8bd 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -20,7 +20,6 @@ */ #include "includes.h" -#include "libcli/ldap/ldap_ndr.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "lib/events/events.h" @@ -28,6 +27,7 @@ #include "smbd/service_task.h" #include "cldap_server/cldap_server.h" #include "librpc/gen_ndr/ndr_misc.h" +#include "libcli/ldap/ldap_ndr.h" #include "dsdb/samdb/samdb.h" #include "auth/auth.h" #include "ldb_wrap.h" |