The branch, master has been updated
via a7f4c2b s3: Remove an unnecessary ()
via 7a2daf3 s3: Use string_term_tdb_data where appropriate
via c6aa36c s3: Fix const warnings
from 33ff033 s4-provision: Give better clues on what Samba needs for
s3fs ACL support
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a7f4c2b6643002c22505566e0833162c6f4d5088
Author: Volker Lendecke <[email protected]>
Date: Thu Jun 14 20:33:52 2012 +0200
s3: Remove an unnecessary ()
Signed-off-by: Michael Adam <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Thu Jun 21 16:05:30 CEST 2012 on sn-devel-104
commit 7a2daf34f28ff25a993edb9c10b3327db70ce258
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 20 11:47:53 2012 +0200
s3: Use string_term_tdb_data where appropriate
Signed-off-by: Michael Adam <[email protected]>
commit c6aa36c6c4ca9326b9f49dfb71c3222e8bf2cd69
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 20 11:47:32 2012 +0200
s3: Fix const warnings
Signed-off-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/ctdbd_conn.c | 8 ++++----
source3/winbindd/idmap_tdb_common.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 8219bd2..9bd5178 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -246,7 +246,7 @@ static bool ctdb_req_complete(const uint8_t *buf, size_t
available,
return False;
}
- msglen = *((uint32 *)buf);
+ msglen = *((const uint32 *)buf);
DEBUG(11, ("msglen = %d\n", msglen));
@@ -1284,8 +1284,7 @@ NTSTATUS ctdbd_db_attach(struct ctdbd_connection *conn,
int32_t cstatus;
bool persistent = (tdb_flags & TDB_CLEAR_IF_FIRST) == 0;
- data.dptr = (uint8_t*)name;
- data.dsize = strlen(name)+1;
+ data = string_term_tdb_data(name);
status = ctdbd_control(conn, CTDB_CURRENT_NODE,
persistent
@@ -1645,7 +1644,8 @@ static void smbd_ctdb_canonicalize_ip(const struct
sockaddr_storage *in,
#ifdef HAVE_IPV6
if (in->ss_family == AF_INET6) {
const char prefix[12] = { 0,0,0,0,0,0,0,0,0,0,0xff,0xff };
- const struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)in;
+ const struct sockaddr_in6 *in6 =
+ (const struct sockaddr_in6 *)in;
struct sockaddr_in *out4 = (struct sockaddr_in *)out;
if (memcmp(&in6->sin6_addr, prefix, 12) == 0) {
memset(out, 0, sizeof(*out));
diff --git a/source3/winbindd/idmap_tdb_common.c
b/source3/winbindd/idmap_tdb_common.c
index 669caf5..6f700b8 100644
--- a/source3/winbindd/idmap_tdb_common.c
+++ b/source3/winbindd/idmap_tdb_common.c
@@ -583,7 +583,7 @@ static NTSTATUS
idmap_tdb_common_sids_to_unixids_action(struct db_context *db,
}
}
- if ((state->ids[i]->status == ID_MAPPED)) {
+ if (state->ids[i]->status == ID_MAPPED) {
num_mapped += 1;
}
--
Samba Shared Repository
