[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  93c54a4b3c4 statvfs: rename linux_statvfs to posix_statvfs
       via  121db8c08f4 waf:lib/replace: fix a build error with non-gcc compilers
       via  7643ee2ea85 s3/smbd: fix utmp hostname logging on Solaris
       via  c53e8de43ce waf: check for utmpx struct member ut_host
      from  36ff1a51266 netcmd: Fix broken samba-tool gpo commands

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


- Log -----------------------------------------------------------------
commit 93c54a4b3c4b08ad8a80235ffcffb9bc89fd9ecf
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jan 9 12:03:53 2019 +0100

    statvfs: rename linux_statvfs to posix_statvfs
    
    the statvfs call is posix standard and not Linux specific
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Björn Jacke <bjacke at samba.org>
    Autobuild-Date(master): Fri Jan 11 02:53:57 CET 2019 on sn-devel-144

commit 121db8c08f45ca15310d9d62b868b4e38353bcc6
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Jan 6 20:41:32 2019 +0100

    waf:lib/replace: fix a build error with non-gcc compilers
    
    3a175830e579ab10231439657b23733338cd5634 added that variable which should have
    been an empty initialization here. -Wno-format-zero-length (which might be
    unsupported by the compiler) should not be set if we really only want to
    initialize the cflags.
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 7643ee2ea857cfbf727f9bf03f9e3e8cddf84a21
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Jan 6 21:35:14 2019 +0100

    s3/smbd: fix utmp hostname logging on Solaris
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=2489
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit c53e8de43ce1c86111993f791e5440a656dc75a8
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Jan 6 20:46:20 2019 +0100

    waf: check for utmpx struct member ut_host
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=2489
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 lib/replace/wscript    | 2 +-
 source3/smbd/statvfs.c | 4 ++--
 source3/smbd/utmp.c    | 2 +-
 source3/wscript        | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 6cbae932b20..a7fd25d15bc 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -857,7 +857,7 @@ def build(bld):
                       private_library=True,
                       deps='crypt dl nsl socket rt attr' + extra_libs)
 
-    replace_test_cflags="-Wno-format-zero-length"
+    replace_test_cflags = ''
     if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
         replace_test_cflags += " -Wno-format-truncation"
     bld.SAMBA_SUBSYSTEM('replace-test',
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 2312d2c8240..aca6752c7fb 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -115,7 +115,7 @@ static int bsd_statvfs(const char *path, vfs_statvfs_struct *statbuf)
 	return ret;
 }
 #elif defined(STAT_STATVFS) && defined(HAVE_FSID_INT)
-static int linux_statvfs(const char *path, vfs_statvfs_struct *statbuf)
+static int posix_statvfs(const char *path, vfs_statvfs_struct *statbuf)
 {
 	struct statvfs statvfs_buf;
 	int result;
@@ -169,7 +169,7 @@ int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf)
 #if defined(BSD_STYLE_STATVFS)
 	return bsd_statvfs(path, statbuf);
 #elif defined(STAT_STATVFS) && defined(HAVE_FSID_INT)
-	return linux_statvfs(path, statbuf);
+	return posix_statvfs(path, statbuf);
 #else
 	/* BB change this to return invalid level */
 #ifdef EOPNOTSUPP
diff --git a/source3/smbd/utmp.c b/source3/smbd/utmp.c
index cdbcc28cce6..4327301e3b1 100644
--- a/source3/smbd/utmp.c
+++ b/source3/smbd/utmp.c
@@ -429,7 +429,7 @@ static void sys_utmp_update(struct utmp *u, const char *hostname, bool claim)
 	else
 		ux.ut_syslen = 0;
 #endif
-#if defined(HAVE_UT_UT_HOST)
+#if defined(HAVE_UX_UT_HOST)
 	utmp_strcpy(ux.ut_host, hostname, sizeof(ux.ut_host));
 #endif
 
diff --git a/source3/wscript b/source3/wscript
index f9e9d3013bc..24e52e592c9 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -809,6 +809,8 @@ msg.msg_accrightslen = sizeof(fd);
                                     define='HAVE_UT_UT_EXIT')
         conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_syslen', headers='utmpx.h',
                                     define='HAVE_UX_UT_SYSLEN')
+        conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_host', headers='utmpx.h',
+                                    define='HAVE_UX_UT_HOST')
         conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);',
                         'PUTUTLINE_RETURNS_UTMP', headers='utmp.h',
                         msg="Checking whether pututline returns pointer")


-- 
Samba Shared Repository