[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  3c58fb2 setup: Use standard octal ints rather than harcoding.
       via  17e96d8 popt_common: Add missing dependency on libsamba-hostconfig.
      from  e2b6399 s3: Make winbind_add_failed_connection_entry static

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


- Log -----------------------------------------------------------------
commit 3c58fb27b0deb4971a77e8aa5ba74d984b81ab7c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 8 22:11:55 2010 +0200

    setup: Use standard octal ints rather than harcoding.

commit 17e96d8194c1d1ded747f11ffe93ff9eaa0d4266
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Sep 8 22:11:23 2010 +0200

    popt_common: Add missing dependency on libsamba-hostconfig.

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

Summary of changes:
 source4/lib/cmdline/wscript_build |    5 ++---
 source4/setup/wscript_build       |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index 0229089..ac1ff2a 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -10,11 +10,10 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 	source='popt_common.c',
 	public_deps='popt',
 	public_headers='popt_common.h:popt.h',
-        header_path='samba',
-        deps='talloc'
+	header_path='samba',
+	deps='talloc LIBSAMBA-HOSTCONFIG'
 	)
 
-
 bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS',
 	source='popt_credentials.c',
 	autoproto='popt_credentials.h',
diff --git a/source4/setup/wscript_build b/source4/setup/wscript_build
index 2d1e3ec..f337e6f 100644
--- a/source4/setup/wscript_build
+++ b/source4/setup/wscript_build
@@ -3,8 +3,7 @@
 bld.INSTALL_WILDCARD('${SETUPDIR}', 'ad-schema/*.txt')
 bld.INSTALL_WILDCARD('${SETUPDIR}', 'display-specifiers/*.txt')
 
-O755 = 493
-bld.INSTALL_FILES('${SBINDIR}','provision', chmod=O755, python_fixup=True)
+bld.INSTALL_FILES('${SBINDIR}', 'provision', chmod=0755, python_fixup=True)
 
 bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
 bld.INSTALL_FILES('${SETUPDIR}', 'spn_update_list')


-- 
Samba Shared Repository