[SCM] Samba Shared Repository - branch master updated - cc2d1eb743bb5b49b88a6fbdfeeb8730fb8e6189

Jelmer Vernooij jelmer at samba.org
Tue Dec 16 21:22:31 GMT 2008 

The branch, master has been updated
       via  cc2d1eb743bb5b49b88a6fbdfeeb8730fb8e6189 (commit)
       via  b3c926376cd2ba0e5d6dc84927eac92cdbd09c45 (commit)
      from  bbd5824140992ea457d4270ee77018ebb367abc9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cc2d1eb743bb5b49b88a6fbdfeeb8730fb8e6189
Merge: b3c926376cd2ba0e5d6dc84927eac92cdbd09c45 bbd5824140992ea457d4270ee77018ebb367abc9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 22:22:15 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit b3c926376cd2ba0e5d6dc84927eac92cdbd09c45
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 16 22:20:21 2008 +0100

    Fix header installation after move of gen_ndr headers.

-----------------------------------------------------------------------

Summary of changes:
 source4/headermap.txt    |   44 ++++++++++++++++++++++----------------------
 source4/librpc/config.mk |   14 +++++++-------
 2 files changed, 29 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/headermap.txt b/source4/headermap.txt
index c906282..ff365b3 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -25,25 +25,25 @@ libcli/util/doserr.h: core/doserr.h
 libcli/util/ntstatus.h: core/ntstatus.h
 libcli/cldap/cldap.h: cldap.h
 librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
-librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
-librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
+../librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
+../librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
 librpc/gen_ndr/ndr_dcerpc.h: gen_ndr/ndr_dcerpc.h
-librpc/gen_ndr/mgmt.h: gen_ndr/mgmt.h
-librpc/gen_ndr/ndr_mgmt.h: gen_ndr/ndr_mgmt.h
-librpc/gen_ndr/ndr_mgmt_c.h: gen_ndr/ndr_mgmt_c.h
-librpc/gen_ndr/epmapper.h: gen_ndr/epmapper.h
-librpc/gen_ndr/ndr_epmapper.h: gen_ndr/ndr_epmapper.h
-librpc/gen_ndr/ndr_epmapper_c.h: gen_ndr/ndr_epmapper_c.h
-librpc/gen_ndr/ndr_atsvc.h: gen_ndr/ndr_atsvc.h
-librpc/gen_ndr/atsvc.h: gen_ndr/atsvc.h
-librpc/gen_ndr/ndr_atsvc_c.h: gen_ndr/ndr_atsvc_c.h
-librpc/gen_ndr/misc.h: gen_ndr/misc.h
-librpc/gen_ndr/lsa.h: gen_ndr/lsa.h
-librpc/gen_ndr/samr.h: gen_ndr/samr.h
-librpc/gen_ndr/ndr_samr.h: gen_ndr/ndr_samr.h
-librpc/gen_ndr/ndr_samr_c.h: gen_ndr/ndr_samr_c.h
-librpc/gen_ndr/security.h: gen_ndr/security.h
-librpc/gen_ndr/dom_sid.h: gen_ndr/dom_sid.h
+../librpc/gen_ndr/mgmt.h: gen_ndr/mgmt.h
+../librpc/gen_ndr/ndr_mgmt.h: gen_ndr/ndr_mgmt.h
+../librpc/gen_ndr/ndr_mgmt_c.h: gen_ndr/ndr_mgmt_c.h
+../librpc/gen_ndr/epmapper.h: gen_ndr/epmapper.h
+../librpc/gen_ndr/ndr_epmapper.h: gen_ndr/ndr_epmapper.h
+../librpc/gen_ndr/ndr_epmapper_c.h: gen_ndr/ndr_epmapper_c.h
+../librpc/gen_ndr/ndr_atsvc.h: gen_ndr/ndr_atsvc.h
+../librpc/gen_ndr/atsvc.h: gen_ndr/atsvc.h
+../librpc/gen_ndr/ndr_atsvc_c.h: gen_ndr/ndr_atsvc_c.h
+../librpc/gen_ndr/misc.h: gen_ndr/misc.h
+../librpc/gen_ndr/lsa.h: gen_ndr/lsa.h
+../librpc/gen_ndr/samr.h: gen_ndr/samr.h
+../librpc/gen_ndr/ndr_samr.h: gen_ndr/ndr_samr.h
+../librpc/gen_ndr/ndr_samr_c.h: gen_ndr/ndr_samr_c.h
+../librpc/gen_ndr/security.h: gen_ndr/security.h
+../librpc/gen_ndr/dom_sid.h: gen_ndr/dom_sid.h
 auth/credentials/credentials.h: credentials.h
 auth/credentials/credentials_krb5.h: credentials/krb5.h
 rpc_server/dcerpc_server.h: dcerpc_server.h
@@ -53,11 +53,11 @@ libcli/auth/credentials.h: domain_credentials.h
 libcli/ldap/ldap.h: ldap-util.h
 ../lib/torture/torture.h: torture.h
 libcli/libcli.h: client.h
-librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
+../librpc/gen_ndr/nbt.h: gen_ndr/nbt.h
 librpc/gen_ndr/ntp_signd.h: gen_ndr/ntp_signd.h
-librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h
-librpc/gen_ndr/ndr_svcctl.h: gen_ndr/ndr_svcctl.h
-librpc/gen_ndr/ndr_svcctl_c.h: gen_ndr/ndr_svcctl_c.h
+../librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h
+../librpc/gen_ndr/ndr_svcctl.h: gen_ndr/ndr_svcctl.h
+../librpc/gen_ndr/ndr_svcctl_c.h: gen_ndr/ndr_svcctl_c.h
 lib/cmdline/popt_common.h: samba/popt.h
 ../lib/util/dlinklist.h: dlinklist.h
 ../lib/util/data_blob.h: util/data_blob.h
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 475d14e..dcf2f3e 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -56,7 +56,7 @@ NDR_SECURITY_OBJ_FILES = ../librpc/gen_ndr/ndr_security.o \
 			 ../librpc/ndr/ndr_sec_helper.o \
 			 $(gen_ndrsrcdir)/ndr_server_id.o
 
-PUBLIC_HEADERS += ../librpc/gen_ndr/security.h)
+PUBLIC_HEADERS += ../librpc/gen_ndr/security.h
 
 
 [SUBSYSTEM::NDR_AUDIOSRV]
@@ -166,7 +166,7 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA NDR_SECURITY
 
 NDR_SAMR_OBJ_FILES = ../librpc/gen_ndr/ndr_samr.o
 
-PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/ndr_samr_c.h)
+PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, samr.h ndr_samr.h ndr_samr_c.h)
 
 [SUBSYSTEM::NDR_NFS4ACL]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
@@ -199,14 +199,14 @@ PUBLIC_DEPENDENCIES = LIBNDR
 
 NDR_SVCCTL_OBJ_FILES = ../librpc/gen_ndr/ndr_svcctl.o
 
-PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h)
+PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, ndr_svcctl.h svcctl.h)
 
 [SUBSYSTEM::NDR_ATSVC]
 PUBLIC_DEPENDENCIES = LIBNDR
 
 NDR_ATSVC_OBJ_FILES = ../librpc/gen_ndr/ndr_atsvc.o
 
-PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr, atsvc.h ndr_atsvc.h)
+PUBLIC_HEADERS += $(addprefix ../librpc/gen_ndr/, atsvc.h ndr_atsvc.h)
 
 [SUBSYSTEM::NDR_EVENTLOG]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA
@@ -626,9 +626,9 @@ dcerpc_OBJ_FILES = $(addprefix $(dcerpcsrcdir)/, dcerpc.o dcerpc_auth.o dcerpc_s
 $(eval $(call proto_header_template,$(dcerpcsrcdir)/dcerpc_proto.h,$(dcerpc_OBJ_FILES:.o=.c)))
 
 
-PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, rpc/dcerpc.h \
-			gen_ndr/mgmt.h gen_ndr/ndr_mgmt.h gen_ndr/ndr_mgmt_c.h \
-			gen_ndr/epmapper.h gen_ndr/ndr_epmapper.h gen_ndr/ndr_epmapper_c.h)
+PUBLIC_HEADERS += $(addprefix $(librpcsrcdir)/, rpc/dcerpc.h) \
+			$(addprefix ../librpc/gen_ndr/, mgmt.h ndr_mgmt.h ndr_mgmt_c.h \
+			epmapper.h ndr_epmapper.h ndr_epmapper_c.h)
 
 
 [PYTHON::python_dcerpc]


-- 
Samba Shared Repository

More information about the samba-cvs mailing list