diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-11-10 13:37:54 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-11-17 00:34:08 +0100 |
| commit | f099feaa01b6548cb60cb9d7d50b1f196b1af878 (patch) | |
| tree | 47e86ced021fa016fd3fc2ca4891841aa6454d7e | |
| parent | df9a1ea6cb18d4e701471ddd0144dbc970c4eb88 (diff) | |
| download | samba-f099feaa01b6548cb60cb9d7d50b1f196b1af878.tar.gz samba-f099feaa01b6548cb60cb9d7d50b1f196b1af878.tar.bz2 samba-f099feaa01b6548cb60cb9d7d50b1f196b1af878.zip | |
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>
| -rw-r--r-- | lib/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_become_dmb.c | 2 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_processlogon.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 1 |
6 files changed, 4 insertions, 6 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index cb378f471e..44d219a9e4 100644 --- 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 b2a10f69d6..b9e7f384ab 100644 --- 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 276c381f6c..a3b3d585ce 100644 --- 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 43ffd726c6..4fe5d0ee87 100644 --- 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 11da2a9687..285023944a 100644 --- 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 5d4c06d31a..1e11eeb4b2 100644 --- 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, |