[SCM] Samba Shared Repository - branch master updated

[Garming Sam]

The branch, master has been updated
       via  d692020 ctdb: Fix detection of gnukfreebsd
      from  2bd28d2 lib/util/util.c: move null-check before use

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


- Log -----------------------------------------------------------------
commit d692020c1aa75ca1f1950d451937334766da238f
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Thu Feb 11 02:27:29 2016 +0000

    ctdb: Fix detection of gnukfreebsd
    
    GNU/kFreeBSD's platform name is 'gnukfreebsd', not just 'kfreebsd'.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Tue Mar  1 05:42:23 CET 2016 on sn-devel-144

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

Summary of changes:
 ctdb/wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/wscript b/ctdb/wscript
index 6dc855f..4351efa 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -315,7 +315,7 @@ def build(bld):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_aix.c')
     elif sys.platform.startswith('freebsd'):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_freebsd.c')
-    elif sys.platform == 'kfreebsd':
+    elif sys.platform.startswith('gnukfreebsd'):
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_kfreebsd.c')
     elif sys.platform == 'gnu':
         CTDB_SYSTEM_SRC = bld.SUBDIR('common', 'system_gnu.c')


-- 
Samba Shared Repository