summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-06-06 13:02:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:10 -0500
commit4a99ee023609a3e753bb66e1fcd019a97447d9dd (patch)
treee9f9fd0d2eab20586463f4093f8e3ab6002edbdc
parent422722aad2e50465627a2f7b249c251652297a7b (diff)
downloadsamba-4a99ee023609a3e753bb66e1fcd019a97447d9dd.tar.gz
samba-4a99ee023609a3e753bb66e1fcd019a97447d9dd.tar.xz
samba-4a99ee023609a3e753bb66e1fcd019a97447d9dd.zip
r23368: Make "winbind:rpc only" a full blown parameter. Thanks to Karolin for
the patch :-) (This used to be commit 07b71a02aef15b75d281cabeb7140db1bc0bb283)
-rw-r--r--source3/nsswitch/winbindd_cache.c2
-rw-r--r--source3/param/loadparm.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index d1c34100ca2..017a2ebfebb 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -170,7 +170,7 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
if ((our_domain->active_directory || IS_DC)
&& domain->active_directory
- && !lp_parm_bool(-1, "winbind", "rpc only", False)) {
+ && !lp_winbind_rpc_only()) {
DEBUG(5,("get_cache: Setting ADS methods for domain %s\n", domain->name));
domain->backend = &ads_methods;
} else {
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index da2a7d1c68d..9d8b7b195b0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -180,6 +180,7 @@ typedef struct {
BOOL bWinbindRefreshTickets;
BOOL bWinbindOfflineLogon;
BOOL bWinbindNormalizeNames;
+ BOOL bWinbindRpcOnly;
char **szIdmapDomains;
char **szIdmapBackend; /* deprecated */
char *szIdmapAllocBackend;
@@ -1289,6 +1290,7 @@ static struct parm_struct parm_table[] = {
{"winbind refresh tickets", P_BOOL, P_GLOBAL, &Globals.bWinbindRefreshTickets, NULL, NULL, FLAG_ADVANCED},
{"winbind offline logon", P_BOOL, P_GLOBAL, &Globals.bWinbindOfflineLogon, NULL, NULL, FLAG_ADVANCED},
{"winbind normalize names", P_BOOL, P_GLOBAL, &Globals.bWinbindNormalizeNames, NULL, NULL, FLAG_ADVANCED},
+ {"winbind rpc only", P_BOOL, P_GLOBAL, &Globals.bWinbindRpcOnly, NULL, NULL, FLAG_ADVANCED},
{NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0}
};
@@ -1899,6 +1901,7 @@ FN_GLOBAL_BOOL(lp_winbind_nested_groups, &Globals.bWinbindNestedGroups)
FN_GLOBAL_BOOL(lp_winbind_refresh_tickets, &Globals.bWinbindRefreshTickets)
FN_GLOBAL_BOOL(lp_winbind_offline_logon, &Globals.bWinbindOfflineLogon)
FN_GLOBAL_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames)
+FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
FN_GLOBAL_LIST(lp_idmap_domains, &Globals.szIdmapDomains)
FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend) /* deprecated */