The branch, v3-2-ctdb has been updated
via 5e91bf76bdaa916a0a6428c1ae6dae521a1674af (commit)
via cd1346e0f4b39251cf6045367bd4c75d9c1bbf2c (commit)
via 6210a0a0ec408cbf1b772e360b609e93e5654e71 (commit)
from aae05b591ffcd4365a151ae9acee5f626b7cdf75 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit 5e91bf76bdaa916a0a6428c1ae6dae521a1674af
Author: Michael Adam <[email protected]>
Date: Fri May 8 11:22:59 2009 +0200
net groupfilter: fix an unused variable warning.
Michael
commit cd1346e0f4b39251cf6045367bd4c75d9c1bbf2c
Author: Jeremy Allison <[email protected]>
Date: Thu Feb 19 13:11:36 2009 -0800
Fix printf type warning. Jeremy.
commit 6210a0a0ec408cbf1b772e360b609e93e5654e71
Author: Michael Adam <[email protected]>
Date: Fri May 8 01:11:43 2009 +0200
s3: make release_ip() call (ctdb) cope with IPv4 mapped addresses
Michael
-----------------------------------------------------------------------
Summary of changes:
source/registry/reg_backend_db.c | 4 ++--
source/smbd/server.c | 9 ++++++++-
source/utils/net.c | 1 -
3 files changed, 10 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/registry/reg_backend_db.c b/source/registry/reg_backend_db.c
index 40b1525..83e2b4b 100644
--- a/source/registry/reg_backend_db.c
+++ b/source/registry/reg_backend_db.c
@@ -644,8 +644,8 @@ static bool regdb_store_keys_internal(const char *key,
struct regsubkey_ctr *ctr
(len+thistime)*2);
if(buffer == NULL) {
DEBUG(0, ("regdb_store_keys: Failed to realloc "
- "memory of size [%d]\n",
- (len+thistime)*2));
+ "memory of size [%u]\n",
+ (unsigned int)(len+thistime)*2));
ret = false;
goto done;
}
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 3f251d8..67f528c 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -991,8 +991,15 @@ received when we should release a specific IP
static void release_ip(const char *ip, void *priv)
{
char addr[INET6_ADDRSTRLEN];
+ char *p;
- if (strcmp(client_socket_addr(get_client_fd(),addr,sizeof(addr)), ip)
== 0) {
+ client_socket_addr(get_client_fd(),addr,sizeof(addr));
+
+ if (strncmp("::ffff:", addr, 7) == 0) {
+ p = addr + 7;
+ }
+
+ if ((strcmp(p, ip) == 0) || (strcmp(addr, ip) == 0)) {
/* we can't afford to do a clean exit - that involves
database writes, which would potentially mean we
are still running after the failover has finished -
diff --git a/source/utils/net.c b/source/utils/net.c
index c0aa4fd..22905a8 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -1043,7 +1043,6 @@ static int net_groupfilter_list(int argc, const char
**argv)
static int net_groupfilter(int argc, const char **argv)
{
- int ret = -1;
struct functable2 func[] = {
{
"addsid",
--
SAMBA-CTDB repository
