The branch, master has been updated
via e3b6b46 Force cast to long as on some platform tv_usec is 32bit long
via 9eb91a50 uid_t is a synonym for int on osX
via f2ec75c osX define uint64_t as long long int
from e5ecef6 WHATSNEW: list SMB3 as max protocol and durable handles as
changes since 4.0 beta8
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e3b6b465ee4837de647c90eb6c1ac4af2047b06a
Author: Matthieu Patou <m...@matws.net>
Date: Sat Sep 8 00:21:47 2012 -0700
Force cast to long as on some platform tv_usec is 32bit long
Autobuild-User(master): Matthieu Patou <m...@samba.org>
Autobuild-Date(master): Mon Sep 10 07:33:50 CEST 2012 on sn-devel-104
commit 9eb91a5055e6201e0bd808c634a3e31c7d075f91
Author: Matthieu Patou <m...@matws.net>
Date: Sat Sep 8 00:19:33 2012 -0700
uid_t is a synonym for int on osX
This function is clearly osX oriented so we adapt the modifier to the
target
commit f2ec75c7df5965f474a3c9444b23bcfe2818fe90
Author: Matthieu Patou <m...@matws.net>
Date: Sat Sep 8 00:12:51 2012 -0700
osX define uint64_t as long long int
-----------------------------------------------------------------------
Summary of changes:
lib/replace/replace.h | 2 +-
source3/smbd/sec_ctx.c | 2 +-
source4/torture/libnet/userman.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index fa7cc78..c7f9c71 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -61,7 +61,7 @@
#endif
#ifndef __PRI64_PREFIX
-# if __WORDSIZE == 64
+# if __WORDSIZE == 64 && ! defined __APPLE__
# define __PRI64_PREFIX "l"
# else
# define __PRI64_PREFIX "ll"
diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index d73dcf4..83674a2 100644
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -291,7 +291,7 @@ static void set_unix_security_ctx(uid_t uid, gid_t gid, int
ngroups, gid_t *grou
if (syscall(SYS_initgroups, (ngroups > max) ? max : ngroups,
groups, uid) == -1 && !non_root_mode()) {
DEBUG(0, ("WARNING: failed to set group list "
- "(%d groups) for UID %ld: %s\n",
+ "(%d groups) for UID %d: %s\n",
ngroups, uid, strerror(errno)));
smb_panic("sys_setgroups failed");
}
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 16e169f..521ad99 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -250,10 +250,10 @@ static bool test_userdel(struct torture_context *tctx,
if (timeval_compare(&t, mod->in.change.fld)) { \
torture_comment(tctx, "'%s' field does not match\n",
#fld); \
torture_comment(tctx, "received: '%s (+%ld us)'\n", \
- timestring(mem_ctx, t.tv_sec), t.tv_usec); \
+ timestring(mem_ctx, t.tv_sec), (long)t.tv_usec);
\
torture_comment(tctx, "expected: '%s (+%ld us)'\n", \
timestring(mem_ctx, mod->in.change.fld->tv_sec),
\
- mod->in.change.fld->tv_usec); \
+ (long)mod->in.change.fld->tv_usec); \
return false; \
} \
}
--
Samba Shared Repository
