diff options
| author | Jeremy Allison <jra@samba.org> | 1997-12-16 12:21:39 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-12-16 12:21:39 +0000 |
| commit | e9ef2a5a5e9bbec686429f00366b6d72cba83d03 (patch) | |
| tree | b19c7e8d5611edc725caf072336ce08b1e65c6f2 /source3 | |
| parent | dfac756abc7415d786c63020fd3c015ac317893d (diff) | |
| download | samba-e9ef2a5a5e9bbec686429f00366b6d72cba83d03.tar.gz samba-e9ef2a5a5e9bbec686429f00366b6d72cba83d03.tar.bz2 samba-e9ef2a5a5e9bbec686429f00366b6d72cba83d03.zip | |
WHATSNEW.txt - updated for 1.9.18alpha13.
docs/smb.conf.5: Removed unused NTDOMAIN params. Added new params.
source/loadparm.c: Put #ifdef NTDOMAIN around unused params.
source/nmbd_become_lmb.c: Removed check for workgroup name in lmb name.
Jeremy.
(This used to be commit 5136c5ec119968b39e2cf9d7f3e6836d9286a51f)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/nmbd/nmbd_become_lmb.c | 6 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/nmbd/nmbd_become_lmb.c b/source3/nmbd/nmbd_become_lmb.c index 6496a2f9e5..6dcd61d76c 100644 --- a/source3/nmbd/nmbd_become_lmb.c +++ b/source3/nmbd/nmbd_become_lmb.c @@ -544,6 +544,11 @@ void set_workgroup_local_master_browser_name( struct work_record *work, char *ne DEBUG(5,("set_workgroup_local_master_browser_name: setting local master name to '%s' \ for workgroup %s.\n", newname, work->work_group )); +#if 0 + /* + * Apparently some sites use the workgroup name as the local + * master browser name. Arrrrggghhhhh ! (JRA). + */ if(strequal( work->work_group, newname)) { DEBUG(5, ("set_workgroup_local_master_browser_name: Refusing to set \ @@ -551,6 +556,7 @@ local_master_browser_name for workgroup %s to workgroup name.\n", work->work_group )); return; } +#endif StrnCpy(work->local_master_browser_name, newname, sizeof(work->local_master_browser_name)-1); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 277430ecc4..47faefc571 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -471,6 +471,7 @@ static struct parm_struct {"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL}, {"valid chars", P_STRING, P_GLOBAL, &Globals.szValidChars, handle_valid_chars, NULL}, {"workgroup", P_USTRING, P_GLOBAL, &Globals.szWorkGroup, NULL, NULL}, +#ifdef NTDOMAIN {"domain sid", P_USTRING, P_GLOBAL, &Globals.szDomainSID, NULL, NULL}, {"domain other sids",P_STRING, P_GLOBAL, &Globals.szDomainOtherSIDs, NULL, NULL}, {"domain groups", P_STRING, P_GLOBAL, &Globals.szDomainGroups, NULL, NULL}, @@ -481,6 +482,7 @@ static struct parm_struct {"domain allow hosts",P_STRING, P_GLOBAL, &Globals.szDomainHostsallow, NULL, NULL}, {"domain hosts deny", P_STRING, P_GLOBAL, &Globals.szDomainHostsdeny, NULL, NULL}, {"domain deny hosts", P_STRING, P_GLOBAL, &Globals.szDomainHostsdeny, NULL, NULL}, +#endif /* NTDOMAIN */ {"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL}, {"character set", P_STRING, P_GLOBAL, &Globals.szCharacterSet, handle_character_set, NULL}, {"logon script", P_STRING, P_GLOBAL, &Globals.szLogonScript, NULL, NULL}, @@ -898,6 +900,7 @@ FN_GLOBAL_STRING(lp_announce_version,&Globals.szAnnounceVersion) FN_GLOBAL_STRING(lp_netbios_aliases,&Globals.szNetbiosAliases) FN_GLOBAL_STRING(lp_driverfile,&Globals.szDriverFile) +#ifdef NTDOMAIN FN_GLOBAL_STRING(lp_domain_sid,&Globals.szDomainSID) FN_GLOBAL_STRING(lp_domain_other_sids,&Globals.szDomainOtherSIDs) FN_GLOBAL_STRING(lp_domain_groups,&Globals.szDomainGroups) @@ -905,7 +908,7 @@ FN_GLOBAL_STRING(lp_domain_admin_users,&Globals.szDomainAdminUsers) FN_GLOBAL_STRING(lp_domain_guest_users,&Globals.szDomainGuestUsers) FN_GLOBAL_STRING(lp_domain_hostsallow,&Globals.szDomainHostsallow) FN_GLOBAL_STRING(lp_domain_hostsdeny,&Globals.szDomainHostsdeny) - +#endif /* NTDOMAIN */ FN_GLOBAL_BOOL(lp_dns_proxy,&Globals.bDNSproxy) FN_GLOBAL_BOOL(lp_wins_support,&Globals.bWINSsupport) |