diff options
| author | John Terpstra <jht@samba.org> | 2003-11-26 18:43:26 +0000 |
|---|---|---|
| committer | John Terpstra <jht@samba.org> | 2003-11-26 18:43:26 +0000 |
| commit | ee8fc934146bf631224b9aed1c4493135fcd3fa5 (patch) | |
| tree | 6c0eb6074505bde3b788db03e9eb2fcf17d352df | |
| parent | 5efc777a0fc353db71829e728e8afc7e20d4154b (diff) | |
| download | samba-ee8fc934146bf631224b9aed1c4493135fcd3fa5.tar.gz samba-ee8fc934146bf631224b9aed1c4493135fcd3fa5.tar.bz2 samba-ee8fc934146bf631224b9aed1c4493135fcd3fa5.zip | |
Fixing barfed idmap entries and adding not on use of FLAG_HIDE.
(This used to be commit 25aa5df5c79070d0f1273a71617e64fba7831742)
| -rw-r--r-- | source3/param/loadparm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 54cc2f3eef..f54c97fc1b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -746,6 +746,12 @@ static const struct enum_list enum_map_to_guest[] = { * Any parameter that does NOT have FLAG_ADVANCED will not disply at all * Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in * respective views. + * + * NOTE2: Handling of duplicated (synonym) paramters: + * Only the first occurance of a parameter should be enabled by FLAG_BASIC + * and/or FLAG_ADVANCED. All duplicates following the first mention should be + * set to FLAG_HIDE. ie: Make you must place the parameter that has the preferred + * name first, and all synonyms must follow it with the FLAG_HIDE attribute. */ static struct parm_struct parm_table[] = { @@ -1147,9 +1153,9 @@ static struct parm_struct parm_table[] = { {"enable rid algorithm", P_BOOL, P_GLOBAL, &Globals.bEnableRidAlgorithm, NULL, NULL, FLAG_DEPRECATED}, {"idmap backend", P_STRING, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED}, {"idmap uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED}, - {"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED}, + {"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_HIDE}, {"idmap gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_ADVANCED}, - {"winbind gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_ADVANCED}, + {"winbind gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_HIDE}, {"template primary group", P_STRING, P_GLOBAL, &Globals.szTemplatePrimaryGroup, NULL, NULL, FLAG_ADVANCED}, {"template homedir", P_STRING, P_GLOBAL, &Globals.szTemplateHomedir, NULL, NULL, FLAG_ADVANCED}, {"template shell", P_STRING, P_GLOBAL, &Globals.szTemplateShell, NULL, NULL, FLAG_ADVANCED}, |