s3-param remove lp_domain_logons(), always use IS_DC

This makes the code internally consistant.

Andrew Bartlett

Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index cb378f471e7c5281ecb57847c4644cc5fa5bc223..44d219a9e49451c742515138e3e8ff8486a8bf9e 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1485,7 +1485,7 @@ static struct loadparm_context *global_loadparm_context;
 #include "lib/param/param_functions.c"
 
 FN_GLOBAL_INTEGER(server_role, server_role)
-FN_GLOBAL_BOOL(domain_logons, domain_logons)
+static FN_GLOBAL_BOOL(domain_logons, domain_logons)
 FN_GLOBAL_INTEGER(domain_master, domain_master)
 FN_GLOBAL_LIST(smb_ports, smb_ports)
 FN_GLOBAL_INTEGER(nbt_port, nbt_port)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index b2a10f69d6ce6a5658bd9fd187f34f78cea59ace..b9e7f384ab3a0032f491021c7eb98748420d5955 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1275,7 +1275,6 @@ bool lp_dns_proxy(void);
 bool lp_we_are_a_wins_server(void);
 bool lp_wins_proxy(void);
 bool lp_local_master(void);
-bool lp_domain_logons(void);
 const char **lp_init_logon_delayed_hosts(void);
 int lp_init_logon_delay(void);
 bool lp_load_printers(void);

diff --git a/source3/nmbd/nmbd_become_dmb.c b/source3/nmbd/nmbd_become_dmb.c
index 276c381f6c8dd6f88a4eb75639cea8d8b6cc6692..a3b3d585ce96a13c85cc3b5dbfb6ef3bab1996c1 100644 (file)
--- a/source3/nmbd/nmbd_become_dmb.c
+++ b/source3/nmbd/nmbd_become_dmb.c
@@ -375,7 +375,7 @@ void add_domain_names(time_t t)
        lastrun = t;
 
        /* Do the "internet group" - <1c> names. */
-       if (lp_domain_logons())
+       if (IS_DC)
                add_logon_names();
 
        /* Do the domain master names. */

diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 43ffd726c677e166345b546d52e6a26ca3f5bfa7..4fe5d0ee876d2b421417f7fd334efc9ab444fc53 100644 (file)
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -329,7 +329,7 @@ void process_logon_packet(struct packet_struct *p, const char *buf,int len,
        }
        ip = ((const struct sockaddr_in *)pss)->sin_addr;
 
-       if (!lp_domain_logons()) {
+       if (!IS_DC) {
                DEBUG(5,("process_logon_packet: Logon packet received from IP %s and domain \
 logons are not enabled.\n", inet_ntoa(p->ip) ));
                return;

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 11da2a968751d62c05c7a157a0e32254069a2529..285023944a411570b69d04827985c99a3a33c13f 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5292,7 +5292,7 @@ FN_GLOBAL_BOOL(lp_dns_proxy, bDNSproxy)
 FN_GLOBAL_BOOL(lp_we_are_a_wins_server, bWINSsupport)
 FN_GLOBAL_BOOL(lp_wins_proxy, bWINSproxy)
 FN_GLOBAL_BOOL(lp_local_master, bLocalMaster)
-FN_GLOBAL_BOOL(lp_domain_logons, bDomainLogons)
+static FN_GLOBAL_BOOL(lp_domain_logons, bDomainLogons)
 FN_GLOBAL_LIST(lp_init_logon_delayed_hosts, szInitLogonDelayedHosts)
 FN_GLOBAL_INTEGER(lp_init_logon_delay, InitLogonDelay)
 FN_GLOBAL_BOOL(lp_load_printers, bLoadPrinters)

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 5d4c06d31a795b30869c2aa0032edd5a21eb4ed0..1e11eeb4b206f3bfd2f5c420583920d7c82155b3 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -74,7 +74,6 @@ static const struct loadparm_s3_context s3_fns =
        .dump = lp_dump,
 
        .server_role = lp_server_role,
-       .domain_logons = lp_domain_logons,
        .domain_master = lp_domain_master,
 
        .winbind_separator = lp_winbind_separator,