[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  0a4ed25 lib-util: put data_blob back in the public library
       via  8b236bd dcerpc: we do not need these as public headers
      from  38995cb s3: Make vlp printing work by default

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 0a4ed25d46831af44be8fef83e86eea047ee8fba
Author: Simo Sorce <idra at samba.org>
Date:   Thu Mar 17 09:02:57 2011 -0400

    lib-util: put data_blob back in the public library
    
    data_blob is defined ina public header, so it needs to be exposed in the public
    library.
    
    Autobuild-User: Simo Sorce <idra at samba.org>
    Autobuild-Date: Thu Mar 17 15:39:08 CET 2011 on sn-devel-104
    (cherry picked from commit 5d55ae0a2907b5ead5fb7d131aa00788d806ed9a)

commit 8b236bded96637e5d55983b7cc0d35a61d6b6809
Author: Simo Sorce <idra at samba.org>
Date:   Wed Mar 16 15:32:53 2011 -0400

    dcerpc: we do not need these as public headers
    
    latest openchange doesn't need these headers either
    fix _PRINTF_ATTRIBUTE in tdr.h, as it was failing to work after removing
    proto.h due to side effects. PRINTF_ATTRIBUTE is ok and is define in talloc.h
    which is included by tdr.h
    
    Autobuild-User: Simo Sorce <idra at samba.org>
    Autobuild-Date: Wed Mar 16 23:45:20 CET 2011 on sn-devel-104
    (cherry picked from commit 2a608ba856a4f28c13f295ac554e46168f3f045c)

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

Summary of changes:
 lib/tdr/tdr.h                    |    2 +-
 lib/util/wscript_build           |    4 ++--
 source3/wscript_build            |    2 +-
 source4/rpc_server/wscript_build |    2 --
 4 files changed, 4 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 lib/util/wscript_build
 mode change 100644 => 100755 source3/wscript_build
 mode change 100644 => 100755 source4/rpc_server/wscript_build


Changeset truncated at 500 lines:

diff --git a/lib/tdr/tdr.h b/lib/tdr/tdr.h
index cd4785e..fa0a4d7 100644
--- a/lib/tdr/tdr.h
+++ b/lib/tdr/tdr.h
@@ -95,6 +95,6 @@ struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx);
 struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx);
 
 NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p);
-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3);
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
 
 #endif /* __TDR_H__ */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
old mode 100644
new mode 100755
index e8883a3..7c18075
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
                   source='''talloc_stack.c smb_threads.c xfile.c
                   util_file.c time.c rbtree.c rfc1738.c select.c
                   genrand.c fsusage.c blocking.c become_daemon.c
-                  data_blob.c signal.c system.c params.c util.c util_id.c util_net.c
+                  signal.c system.c params.c util.c util_id.c util_net.c
                   util_strlist.c idtree.c debug.c''',
                   public_deps='talloc pthread LIBCRYPTO',
                   # until we get all the dependencies in this library in common
@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
 
 if bld.env._SAMBA_BUILD_ == 4:
     bld.SAMBA_LIBRARY('samba-util',
-                      source='''dprintf.c fault.c
+                      source='''dprintf.c fault.c data_blob.c
                       ms_fnmatch.c parmlist.c substitute.c util_str.c
                       ''',
                       deps='samba-util-common',
diff --git a/source3/wscript_build b/source3/wscript_build
old mode 100644
new mode 100755
index c389a19..3d7418f
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -964,7 +964,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
                     deps='DYNCONFIG')
 
 bld.SAMBA3_SUBSYSTEM('samba-util3',
-                    source='',
+                    source='../lib/util/data_blob.c',
                     deps='talloc CHARSET3 samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('ldb3',
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
old mode 100644
new mode 100755
index a1d1fc5..f1d3c0d
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -9,8 +9,6 @@ bld.SAMBA_SUBSYSTEM('DCERPC_SHARE',
 bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
 	source='common/forward.c common/reply.c dcesrv_auth.c',
 	autoproto='common/proto.h',
-	public_headers='common/common.h common/proto.h',
-	header_path='dcerpc_server',
 	deps='ldb DCERPC_SHARE samba_server_gensec'
 	)
 


-- 
Samba Shared Repository