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

[Jelmer Vernooij]

The branch, master has been updated
       via  fc0985dbc546eff9d9d8660a30a0bf923782f2d7 (commit)
       via  f5a87e35d252934cf1c5bc27f4e3290520345d47 (commit)
      from  948218643a04e8bf28de5c716cb9e4115d8b2aa0 (commit)

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


- Log -----------------------------------------------------------------
commit fc0985dbc546eff9d9d8660a30a0bf923782f2d7
Merge: f5a87e35d252934cf1c5bc27f4e3290520345d47 948218643a04e8bf28de5c716cb9e4115d8b2aa0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Nov 25 15:42:47 2008 +0100

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

commit f5a87e35d252934cf1c5bc27f4e3290520345d47
Author: Sam Liddicott <sam at liddicott.com>
Date:   Tue Nov 25 15:41:07 2008 +0100

    Make sure dom_sid.h is installed.

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

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


Changeset truncated at 500 lines:

diff --git a/source4/headermap.txt b/source4/headermap.txt
index ec9feda..b6edaac 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -43,6 +43,7 @@ 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
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 19c76b2..97da760 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -57,7 +57,8 @@ NDR_SECURITY_OBJ_FILES = $(gen_ndrsrcdir)/ndr_security.o \
 			 $(gen_ndrsrcdir)/ndr_dom_sid.o \
 			 $(ndrsrcdir)/ndr_dom_sid.o
 
-PUBLIC_HEADERS += $(gen_ndrsrcdir)/security.h
+PUBLIC_HEADERS += $(addprefix $(gen_ndrsrcdir)/, security.h dom_sid.h)
+
 
 [SUBSYSTEM::NDR_AUDIOSRV]
 PUBLIC_DEPENDENCIES = LIBNDR


-- 
Samba Shared Repository