[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  dfe0029 s3-utils: Fix Bug #8106. Fix the build of smbget on HP NonStop.
       via  47a442c s3-waf: try to fix the build on sunos5.
       via  77ecb74 s3-waf: fix typo in comment.
      from  218e1fc s3: Fix a typo

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit dfe0029521f67163bdea3f82ccd90d91f82d74e6
Author: Günther Deschner <gd at samba.org>
Date:   Tue Apr 26 14:58:01 2011 +0200

    s3-utils: Fix Bug #8106. Fix the build of smbget on HP NonStop.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Apr 26 16:41:17 CEST 2011 on sn-devel-104
    (cherry picked from commit 633dbabe912f43fd4199453720fab299ccfefe03)

commit 47a442c221024d5b18a61ce1c4c3b6bfd8c2fa6e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 22 00:49:54 2011 +0200

    s3-waf: try to fix the build on sunos5.
    
    Guenther
    (cherry picked from commit 0e003515703469e9f66f5119d401366697cdb767)

commit 77ecb74ac65fe12b387312f079aa4795076de791
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 22 00:49:28 2011 +0200

    s3-waf: fix typo in comment.
    
    Guenther
    (cherry picked from commit a505806aa088470c74ad3fbffac223d5400481fc)

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

Summary of changes:
 source3/utils/smbget.c |    1 +
 source3/wscript        |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index fc65b3b..c1ff16b 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -17,6 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "popt_common.h"
 #include "libsmbclient.h"
 
diff --git a/source3/wscript b/source3/wscript
index da4bb73..3b15313 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -191,7 +191,7 @@ main() {
                     'HAVE_KERNEL_OPLOCKS_IRIX', headers='fcntl.h',
                     msg="Checking for IRIX kernel oplock types")
 
-    # Check for krenel share modes
+    # Check for kernel share modes
     conf.CHECK_CODE('''
 #include <sys/types.h>
 #include <fcntl.h>
@@ -334,6 +334,8 @@ utimensat vsyslog _write __write __xstat
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('openbsd') > -1):
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+    elif (host_os.rfind('sunos') > -1):
+        conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     # FIXME: Add more checks here.
     else:
         Logs.warn("Unknown host_os '%s', please report this to samba-technical at samba.org" % host_os)


-- 
Samba Shared Repository