From 33dcb69eaae058933f7cf9cc7e353af0786a7bb1 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Wed, 9 Feb 2011 11:00:00 +0100
Subject: [PATCH] s3: Cope with 192.168.1.1/24 in smbcontrol ip-dropped

---
 source3/winbindd/winbindd_cm.c | 36 ++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 8c77adf854..134b6da97d 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2554,15 +2554,42 @@ void winbind_msg_ip_dropped(struct messaging_context *msg_ctx,
 			    DATA_BLOB *data)
 {
 	struct winbindd_domain *domain;
+	char *freeit = NULL;
+	char *addr;
 
 	if ((data == NULL)
 	    || (data->data == NULL)
 	    || (data->length == 0)
-	    || (data->data[data->length-1] != '\0')
-	    || !is_ipaddress((char *)data->data)) {
-		DEBUG(1, ("invalid msg_ip_dropped message\n"));
+	    || (data->data[data->length-1] != '\0')) {
+		DEBUG(1, ("invalid msg_ip_dropped message: not a valid "
+			  "string\n"));
 		return;
 	}
+
+	addr = (char *)data->data;
+	DEBUG(10, ("IP %s dropped\n", addr));
+
+	if (!is_ipaddress(addr)) {
+		char *slash;
+		/*
+		 * Some code sends us ip addresses with the /netmask
+		 * suffix
+		 */
+		slash = strchr(addr, '/');
+		if (slash == NULL) {
+			DEBUG(1, ("invalid msg_ip_dropped message: %s",
+				  addr));
+			return;
+		}
+		freeit = talloc_strndup(talloc_tos(), addr, slash-addr);
+		if (freeit == NULL) {
+			DEBUG(1, ("talloc failed\n"));
+			return;
+		}
+		addr = freeit;
+		DEBUG(10, ("Stripped /netmask to IP %s\n", addr));
+	}
+
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
 		char sockaddr[INET6_ADDRSTRLEN];
 		if (domain->conn.cli == NULL) {
@@ -2573,11 +2600,12 @@ void winbind_msg_ip_dropped(struct messaging_context *msg_ctx,
 		}
 		client_socket_addr(domain->conn.cli->fd, sockaddr,
 				   sizeof(sockaddr));
-		if (strequal(sockaddr, (char *)data->data)) {
+		if (strequal(sockaddr, addr)) {
 			close(domain->conn.cli->fd);
 			domain->conn.cli->fd = -1;
 		}
 	}
+	TALLOC_FREE(freeit);
 }
 
 extern struct winbindd_child *children;
-- 
2.34.1