[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  096c962 Backport 0e97908 from WAF repository: symlink fix for OpenBSD
      from  d5eb3b2 s4:torture: remove and useless variable and assignment in smb2.session.reauth5

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


- Log -----------------------------------------------------------------
commit 096c962bfe4646274c08b2953d9fbaebb892a689
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Sep 6 23:23:07 2013 -0700

    Backport 0e97908 from WAF repository: symlink fix for OpenBSD
    
    Author: Thomas Nagy <tnagy1024 at gmail.com>
    Signed-off-by: Matthieu Patou <mat at matws.net>
    Reviewed-by: Kai Blin <kai at samba.org>
    
    Autobuild-User(master): Kai Blin <kai at samba.org>
    Autobuild-Date(master): Sat Sep 21 11:14:30 CEST 2013 on sn-devel-104

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

Summary of changes:
 buildtools/wafadmin/Tools/ccroot.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py
index f54c82f..264bdc7 100644
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/buildtools/wafadmin/Tools/ccroot.py
@@ -597,9 +597,12 @@ def apply_vnum(self):
 	path = self.install_path
 	if not path: return
 
-	bld.install_as(path + os.sep + name3, node, env=self.env)
-	bld.symlink_as(path + os.sep + name2, name3)
-	bld.symlink_as(path + os.sep + libname, name3)
+	if self.env.DEST_OS == 'openbsd':
+		bld.install_as(path + os.sep + name2, node, env=self.env, chmod=self.link_task.chmod)
+	else:
+		bld.install_as(path + os.sep + name3, node, env=self.env)
+		bld.symlink_as(path + os.sep + name2, name3)
+		bld.symlink_as(path + os.sep + libname, name3)
 
 	# the following task is just to enable execution from the build dir :-/
 	self.create_task('vnum', node, [node.parent.find_or_declare(name2), node.parent.find_or_declare(name3)])


-- 
Samba Shared Repository