diff options
| author | Gerald Carter <jerry@samba.org> | 2001-05-07 22:10:38 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-05-07 22:10:38 +0000 |
| commit | 495f6e678774b013ec9da268fb69543ec9fc6cc6 (patch) | |
| tree | dbbc650930adf821a075791cc5f8e4eb5ad24aba /source3/param | |
| parent | dbd7e0a54ee39a67e9e368b279cf89ef159b204c (diff) | |
| download | samba-495f6e678774b013ec9da268fb69543ec9fc6cc6.tar.gz samba-495f6e678774b013ec9da268fb69543ec9fc6cc6.tar.bz2 samba-495f6e678774b013ec9da268fb69543ec9fc6cc6.zip | |
merge from 2.2 removing the 'domain XXX' parameters.
(This used to be commit 9aefc86e355bf160300580acb85a58a18207ccdf)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 793cbf7951..d166d8c048 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -153,7 +153,6 @@ typedef struct char *szAnnounceVersion; /* This is initialised in init_globals */ char *szNetbiosAliases; char *szDomainOtherSIDs; - char *szDomainGroups; char *szNameResolveOrder; char *szLdapServer; char *szLdapSuffix; @@ -888,13 +887,10 @@ static struct parm_struct parm_table[] = { {"Domain Options", P_SEP, P_SEPARATOR}, - {"domain groups", P_STRING, P_GLOBAL, &Globals.szDomainGroups, NULL, NULL, 0}, {"domain admin group", P_STRING, P_GLOBAL, &Globals.szDomainAdminGroup, NULL, NULL, 0}, {"domain guest group", P_STRING, P_GLOBAL, &Globals.szDomainGuestGroup, NULL, NULL, 0}, - {"domain admin users", P_STRING, P_GLOBAL, &Globals.szDomainAdminUsers, NULL, NULL, 0}, - {"domain guest users", P_STRING, P_GLOBAL, &Globals.szDomainGuestUsers, NULL, NULL, 0}, + #ifdef USING_GROUPNAME_MAP - {"groupname map", P_STRING, P_GLOBAL, &Globals.szGroupnameMap, NULL, NULL, 0}, #endif /* USING_GROUPNAME_MAP */ @@ -1489,11 +1485,8 @@ FN_GLOBAL_STRING(lp_addusertogroup_script, &Globals.szAddUserToGroupScript) FN_GLOBAL_STRING(lp_deluserfromgroup_script, &Globals.szDelUserToGroupScript) FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook) -FN_GLOBAL_STRING(lp_domain_groups, &Globals.szDomainGroups) FN_GLOBAL_STRING(lp_domain_admin_group, &Globals.szDomainAdminGroup) FN_GLOBAL_STRING(lp_domain_guest_group, &Globals.szDomainGuestGroup) -FN_GLOBAL_STRING(lp_domain_admin_users, &Globals.szDomainAdminUsers) -FN_GLOBAL_STRING(lp_domain_guest_users, &Globals.szDomainGuestUsers) FN_GLOBAL_STRING(lp_winbind_uid, &Globals.szWinbindUID) FN_GLOBAL_STRING(lp_winbind_gid, &Globals.szWinbindGID) FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir) |