sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

s3-param remove lp_domain_logons(), always use IS_DC

Browse Source 
This makes the code internally consistant.

Andrew Bartlett

Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>
This commit is contained in:
Andrew Bartlett 2011-11-10 13:37:54 +11:00
parent df9a1ea6cb
commit f099feaa01
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/loadparm.c
View File

@ -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)

1
source3/include/proto.h
View File

@ -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);

2
source3/nmbd/nmbd_become_dmb.c
View File

@ -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. */

2
source3/nmbd/nmbd_processlogon.c
View File

@ -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;

2
source3/param/loadparm.c
View File

@ -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)

1
source3/param/loadparm_ctx.c
View File

@ -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,