[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Mon Feb 14 10:55:02 MST 2011


The branch, master has been updated
       via  3722f65 librpc: make NDR_KRB5PAC a shared library (libndr-krb5pac.so).
      from  d6a41c2 Return NULL if tevent_add_fd() is passed a negative fd

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


- Log -----------------------------------------------------------------
commit 3722f6535938fe019f9cf019b06d30d57a819899
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 14 11:21:21 2011 +0100

    librpc: make NDR_KRB5PAC a shared library (libndr-krb5pac.so).
    
    Simo, please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Feb 14 18:54:38 CET 2011 on sn-devel-104

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

Summary of changes:
 librpc/{ndr_standard.pc.in => ndr_krb5pac.pc.in} |    6 +++---
 librpc/wscript_build                             |   12 +++++++-----
 source3/wscript_build                            |    2 +-
 source4/auth/kerberos/wscript_build              |    2 +-
 source4/librpc/wscript_build                     |    4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)
 copy librpc/{ndr_standard.pc.in => ndr_krb5pac.pc.in} (57%)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr_standard.pc.in b/librpc/ndr_krb5pac.pc.in
similarity index 57%
copy from librpc/ndr_standard.pc.in
copy to librpc/ndr_krb5pac.pc.in
index d400ef1..21ecb55 100644
--- a/librpc/ndr_standard.pc.in
+++ b/librpc/ndr_krb5pac.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: ndr-standard
-Description: NDR marshallers for the standard set of DCE/RPC interfaces
+Name: ndr-krb5pac
+Description: NDR marshallers for the KRB5 PAC formats
 Requires: ndr
 Version: 0.0.1
-Libs: @LIB_RPATH@ -L${libdir} -lndr-standard
+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 2870388..60637fe 100644
--- 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 19b8f4a..8f6bcad 100644
--- 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 8f01df6..5d29f6a 100644
--- 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 790f1a3..d263904 100755
--- 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'
 	)
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list