BUG 1182: patch from john.klinger@lmco.com (John Klinger) to reanable the -n 'no...

(This used to be commit d1848988d9ee9fdd870bcdd32c938b907419558b)

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 8a0d0f757355613618284e4155f40477b3916597..b55ea297b493ec0d78e641390976b435a92ff18f 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -785,7 +785,7 @@ int main(int argc, char **argv)
                { "foreground", 'F', POPT_ARG_VAL, &Fork, False, "Daemon in foreground mode" },
                { "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Interactive mode" },
                { "single-daemon", 'Y', POPT_ARG_VAL, &opt_dual_daemon, False, "Single daemon mode" },
-               { "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" },
+               { "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, True, "Disable caching" },
                POPT_COMMON_SAMBA
                POPT_TABLEEND
        };

diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 4805e628dd800fc0c592eab48640df5b673cffd9..3ee8c0877b5aec1ae7ffae03e79f9e8d3afb23da 100644 (file)
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -25,6 +25,8 @@
 #include "includes.h"
 #include "winbindd.h"
 
+extern BOOL opt_nocache;
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
@@ -964,7 +966,7 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
        /* Treat the info3 cache as authoritative as the
           lookup_usergroups() function may return cached data. */
 
-       if ((info3 = netsamlogon_cache_get(mem_ctx, &user_sid))) {
+       if ( !opt_nocache && (info3 = netsamlogon_cache_get(mem_ctx, &user_sid))) {
 
                DEBUG(10, ("winbindd_getgroups: info3 has %d groups, %d other sids\n",
                           info3->num_groups2, info3->num_other_sids));