summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-10-17 21:15:00 +0200
committerGünther Deschner <gd@samba.org>2008-10-18 23:25:58 +0200
commit80af41b5eaf362700ce6a22b6cc4698b96dd3b6f (patch)
treeaf29f671ac1ceffe6c7cac7bdec89aea237d0ef7
parentd413e1f40a99e79bc2dcc85ea8a2758ab28e6799 (diff)
downloadsamba-80af41b5eaf362700ce6a22b6cc4698b96dd3b6f.tar.gz
samba-80af41b5eaf362700ce6a22b6cc4698b96dd3b6f.tar.bz2
samba-80af41b5eaf362700ce6a22b6cc4698b96dd3b6f.zip
drsuapi: build new merged drsuapi idl and helpers.
Guenther
-rw-r--r--librpc/idl/drsuapi.idl2
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/librpc/gen_ndr/ndr_drsuapi.h2
-rw-r--r--source4/librpc/config.mk2
4 files changed, 5 insertions, 5 deletions
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index afea8f3efb..e4b5dc1fd9 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -8,7 +8,7 @@ import "security.idl", "misc.idl", "samr.idl";
endpoint("ncacn_np:[\\pipe\\lsass]","ncacn_np:[\\pipe\\protected_storage]", "ncacn_ip_tcp:", "ncalrpc:"),
authservice("ldap"),
helpstring("Active Directory Replication"),
- helper("librpc/ndr/ndr_drsuapi.h"),
+ helper("../librpc/ndr/ndr_drsuapi.h"),
pointer_default(unique)
]
interface drsuapi
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c880f79eb5..643c885cce 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -247,7 +247,7 @@ SERVER_MUTEX_OBJ = lib/server_mutex.o
PASSCHANGE_OBJ = libsmb/passchange.o
-LIBNDR_DRSUAPI_OBJ = librpc/ndr/ndr_drsuapi.o \
+LIBNDR_DRSUAPI_OBJ = ../librpc/ndr/ndr_drsuapi.o \
../librpc/ndr/ndr_compression.o \
librpc/gen_ndr/ndr_drsuapi.o \
librpc/gen_ndr/ndr_drsblobs.o
@@ -1212,7 +1212,7 @@ samba3-idl::
../librpc/idl/notify.idl ../librpc/idl/epmapper.idl librpc/idl/messaging.idl \
../librpc/idl/xattr.idl ../librpc/idl/misc.idl librpc/idl/samr.idl \
../librpc/idl/security.idl ../librpc/idl/dssetup.idl librpc/idl/krb5pac.idl \
- ../librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl librpc/idl/drsuapi.idl \
+ ../librpc/idl/ntsvcs.idl librpc/idl/libnetapi.idl ../librpc/idl/drsuapi.idl \
librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl
#####################################################################
diff --git a/source3/librpc/gen_ndr/ndr_drsuapi.h b/source3/librpc/gen_ndr/ndr_drsuapi.h
index e65bc62301..4b5ead467f 100644
--- a/source3/librpc/gen_ndr/ndr_drsuapi.h
+++ b/source3/librpc/gen_ndr/ndr_drsuapi.h
@@ -6,7 +6,7 @@
#ifndef _HEADER_NDR_drsuapi
#define _HEADER_NDR_drsuapi
-#include "librpc/ndr/ndr_drsuapi.h"
+#include "../librpc/ndr/ndr_drsuapi.h"
#define NDR_DRSUAPI_UUID "e3514235-4b06-11d1-ab04-00c04fc2dcd2"
#define NDR_DRSUAPI_VERSION 4.0
#define NDR_DRSUAPI_NAME "drsuapi"
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index a4eaae4367..f29801ca23 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -139,7 +139,7 @@ NDR_FRSAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_frsapi.o
[SUBSYSTEM::NDR_DRSUAPI]
PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR ASN1_UTIL
-NDR_DRSUAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsuapi.o $(ndrsrcdir)/ndr_drsuapi.o
+NDR_DRSUAPI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_drsuapi.o ../librpc/ndr/ndr_drsuapi.o
[SUBSYSTEM::NDR_DRSBLOBS]
PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI