s3:nmbd: change "nmbd:bind explicit broadcast" into "nmbd bind explicit broadcast"

metze

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0db536d7b90608e0046d6a11ecabde3ba60bbbd2..95519e318f7a7c4d9692b58f7b2cc16a7d7e5c75 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3963,6 +3963,7 @@ const char *lp_logon_drive(void);
 const char *lp_logon_home(void);
 char *lp_remote_announce(void);
 char *lp_remote_browse_sync(void);
+bool lp_nmbd_bind_explicit_broadcast(void);
 const char **lp_wins_server_list(void);
 const char **lp_interfaces(void);
 const char *lp_socket_address(void);

diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c
index 96d7b3211efd0e3001d9276a46f105b01aa92b82..703e229052c3d3e986cd2df20a92772584cd4326 100644 (file)
--- a/source3/nmbd/nmbd_subnetdb.c
+++ b/source3/nmbd/nmbd_subnetdb.c
@@ -80,7 +80,7 @@ static struct subnet_record *make_subnet(const char *name, enum subnet_type type
        int dgram_sock = -1;
        int nmb_bcast = -1;
        int dgram_bcast = -1;
-       bool bind_bcast = lp_parm_bool(-1, "nmbd", "bind explicit broadcast", false);
+       bool bind_bcast = lp_nmbd_bind_explicit_broadcast();
 
        /* Check if we are creating a non broadcast subnet - if so don't create
                sockets.  */

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5bac25c43362a32a166f9a9f6271624ad1ffb2e1..d2da10687f6054675ebd4ed467e0d16f098d7767 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -160,6 +160,7 @@ struct global {
        char *szRemoteAnnounce;
        char *szRemoteBrowseSync;
        char *szSocketAddress;
+       bool bNmbdBindExplicitBroadcast;
        char *szNISHomeMapName;
        char *szAnnounceVersion;        /* This is initialised in init_globals */
        char *szWorkgroup;
@@ -3990,6 +3991,15 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,
        },
+       {
+               .label          = "nmbd bind explicit broadcast",
+               .type           = P_BOOL,
+               .p_class        = P_GLOBAL,
+               .ptr            = &Globals.bNmbdBindExplicitBroadcast,
+               .special        = NULL,
+               .enum_list      = NULL,
+               .flags          = FLAG_ADVANCED,
+       },
        {
                .label          = "homedir map",
                .type           = P_STRING,
@@ -5347,6 +5357,7 @@ FN_GLOBAL_CONST_STRING(lp_logon_drive, &Globals.szLogonDrive)
 FN_GLOBAL_CONST_STRING(lp_logon_home, &Globals.szLogonHome)
 FN_GLOBAL_STRING(lp_remote_announce, &Globals.szRemoteAnnounce)
 FN_GLOBAL_STRING(lp_remote_browse_sync, &Globals.szRemoteBrowseSync)
+FN_GLOBAL_BOOL(lp_nmbd_bind_explicit_broadcast, &Globals.bNmbdBindExplicitBroadcast)
 FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers)
 FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces)
 FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName)