From ecb89cebd63ed1dcf4815a45b2a26c643c939ecb Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 23 Jul 2012 13:15:23 +1000
Subject: docs: Mark "socket address" as deprecated

---
 docs-xml/smbdotconf/misc/socketaddress.xml | 1 +
 lib/param/param_table.c                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml
index b3a81f2ec3..13ae11f395 100644
--- a/docs-xml/smbdotconf/misc/socketaddress.xml
+++ b/docs-xml/smbdotconf/misc/socketaddress.xml
@@ -13,6 +13,7 @@
 
 	<para>By default Samba will accept connections on any
 		address.</para>
+	<para>This parameter is deprecated.  See <smbconfoption name="bind interfaces only">Yes</smbconfoption> and <smbconfoption name="interfaces"></smbconfoption> .</para>
 </description>
 
 <value type="default">0.0.0.0</value>
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 304d38271f..67c72ce724 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3492,7 +3492,7 @@ static struct parm_struct parm_table[] = {
 		.offset		= GLOBAL_VAR(szSocketAddress),
 		.special	= NULL,
 		.enum_list	= NULL,
-		.flags		= FLAG_ADVANCED,
+		.flags		= FLAG_ADVANCED | FLAG_DEPRECATED,
 	},
 	{
 		.label		= "nmbd bind explicit broadcast",
-- 
cgit