librpc: make NDR_KRB5PAC a shared library (libndr-krb5pac.so).

Simo, please check.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Mon Feb 14 18:54:38 CET 2011 on sn-devel-104

diff --git a/librpc/ndr_krb5pac.pc.in b/librpc/ndr_krb5pac.pc.in
new file mode 100644 (file)
index 0000000..21ecb55
--- /dev/null
+++ b/librpc/ndr_krb5pac.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ndr-krb5pac
+Description: NDR marshallers for the KRB5 PAC formats
+Requires: ndr
+Version: 0.0.1
+Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac
+Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 2870388cc84f537850d65d437213b82024049771..60637fe5f88c7890a0a98a793eb90558ff4e662a 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -12,7 +12,7 @@ bld.SAMBA_SUBSYSTEM('NDR_AUTH',
                     source='gen_ndr/ndr_auth.c',
                     public_headers='gen_ndr/auth.h',
                     header_path='gen_ndr',
-                    public_deps='ndr NDR_SECURITY'
+                    public_deps='ndr NDR_SECURITY ndr-krb5pac'
                     )
 
 bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
@@ -266,11 +266,13 @@ bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
        public_deps='ndr NDR_DRSUAPI'
        )
 
-bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
+bld.SAMBA_LIBRARY('ndr-krb5pac',
                     source='ndr/ndr_krb5pac.c gen_ndr/ndr_krb5pac.c',
                     public_deps='ndr ndr-standard NDR_SECURITY',
-                    public_headers='gen_ndr/krb5pac.h',
-                    header_path='gen_ndr'
+                    public_headers='gen_ndr/krb5pac.h gen_ndr/ndr_krb5pac.h',
+                    header_path='gen_ndr',
+                    pc_files='ndr_krb5pac.pc',
+                    vnum='0.0.1'
                     )
 
 
@@ -506,7 +508,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSP',
 # a grouping library for NDR subsystems that may be used by more than one target
 bld.SAMBA_LIBRARY('ndr-samba',
        source=[],
-       deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT NDR_KRB5PAC NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM',
+       deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM',
        private_library=True,
        grouping_library=True
        )

diff --git a/source3/wscript_build b/source3/wscript_build
index 19b8f4a615db18fb7f4949a956deb5fd39b41904..8f6bcade25cf21dd0cd8907a3ed055f0d81b02f2 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -895,7 +895,7 @@ bld.SAMBA_SUBSYSTEM('LIBADS',
 
 bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
-                    deps='NDR_KRB5PAC',
+                    deps='ndr-krb5pac',
                    vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',

diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 8f01df6afff68e4cc109626bc435430f650462f5..5d29f6a619cf1af881729d35285c4cac9a5bd057 100644 (file)
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_LIBRARY('authkrb5',
                   source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
                   autoproto='proto.h',
-                  public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err asn1',
+                  public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1',
                   deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr ldb',
                   private_library=True
                   )

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 790f1a34e47997536c9bfe1e7b4b5d4d246397d1..d263904b0234b0b4972801ab1dfed9f517b8f6c6 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -111,7 +111,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         NDR_DRSUAPI NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS NDR_EPMAPPER
         NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINSIF NDR_MGMT
         NDR_OXIDRESOLVER NDR_REMACT NDR_WZCSVC
-        NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC
+        NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_TRKWKS NDR_KEYSVC ndr-krb5pac
         NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS NDR_NBT NDR_WINSREPL
         NDR_SECURITY NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
@@ -216,7 +216,7 @@ bld.SAMBA_PYTHON('python_winreg',
 
 bld.SAMBA_PYTHON('python_dcerpc_misc',
        source='../../librpc/gen_ndr/py_misc.c',
-       deps='pytalloc-util pyrpc_util NDR_KRB5PAC',
+       deps='pytalloc-util pyrpc_util ndr-krb5pac',
        realname='samba/dcerpc/misc.so'
        )