Author: vlendec Date: 2007-06-06 13:02:24 +0000 (Wed, 06 Jun 2007) New Revision: 23368
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23368 Log: Make "winbind:rpc only" a full blown parameter. Thanks to Karolin for the patch :-) Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0/source/param/loadparm.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0_26/source/param/loadparm.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-06 13:02:14 UTC (rev 23367) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-06 13:02:24 UTC (rev 23368) @@ -170,7 +170,7 @@ 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 { Modified: branches/SAMBA_3_0/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0/source/param/loadparm.c 2007-06-06 13:02:14 UTC (rev 23367) +++ branches/SAMBA_3_0/source/param/loadparm.c 2007-06-06 13:02:24 UTC (rev 23368) @@ -180,6 +180,7 @@ BOOL bWinbindRefreshTickets; BOOL bWinbindOfflineLogon; BOOL bWinbindNormalizeNames; + BOOL bWinbindRpcOnly; char **szIdmapDomains; char **szIdmapBackend; /* deprecated */ char *szIdmapAllocBackend; @@ -1289,6 +1290,7 @@ {"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_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 */ Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c =================================================================== --- branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-06 13:02:14 UTC (rev 23367) +++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-06 13:02:24 UTC (rev 23368) @@ -170,7 +170,7 @@ 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 { Modified: branches/SAMBA_3_0_26/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-06 13:02:14 UTC (rev 23367) +++ branches/SAMBA_3_0_26/source/param/loadparm.c 2007-06-06 13:02:24 UTC (rev 23368) @@ -181,6 +181,7 @@ BOOL bWinbindRefreshTickets; BOOL bWinbindOfflineLogon; BOOL bWinbindNormalizeNames; + BOOL bWinbindRpcOnly; char **szIdmapDomains; char **szIdmapBackend; /* deprecated */ char *szIdmapAllocBackend; @@ -1290,6 +1291,7 @@ {"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} }; @@ -1896,6 +1898,7 @@ 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 */
