[SCM] Samba Shared Repository - branch master updated

Simo Sorce idra at samba.org
Thu Mar 17 08:40:01 MDT 2011


The branch, master has been updated
       via  5d55ae0 lib-util: put data_blob back in the public library
      from  1413af9 s3-waf: add --with-pam_smbpass configure option.

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


- Log -----------------------------------------------------------------
commit 5d55ae0a2907b5ead5fb7d131aa00788d806ed9a
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

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

Summary of changes:
 lib/util/wscript_build |    4 ++--
 source3/wscript_build  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 lib/util/wscript_build
 mode change 100644 => 100755 source3/wscript_build


Changeset truncated at 500 lines:

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 3f7e3b6..dbfb465
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -962,7 +962,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',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list