svn commit: samba r14507 - branches/SAMBA_3_0/source/nsswitch
trunk/source/nsswitch
gd at samba.org
gd at samba.org
Fri Mar 17 10:36:08 GMT 2006
Author: gd
Date: 2006-03-17 10:36:07 +0000 (Fri, 17 Mar 2006)
New Revision: 14507
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14507
Log:
Re-disable accidentially re-enabled paranoia check. This should make
offline logons work again with NT4 and older Samba3 DCs.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
trunk/source/nsswitch/winbindd_pam.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-03-17 10:22:13 UTC (rev 14506)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-03-17 10:36:07 UTC (rev 14507)
@@ -746,12 +746,15 @@
return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
}
+ /* The info3 acct_flags in NT4's samlogon reply don't have
+ * ACB_NORMAL set. */
+#if 0
if (!(my_info3->acct_flags & ACB_NORMAL)) {
DEBUG(10,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n",
my_info3->acct_flags));
return NT_STATUS_LOGON_FAILURE;
}
-
+#endif
kickoff_time = nt_time_to_unix(&my_info3->kickoff_time);
if (kickoff_time != 0 && time(NULL) > kickoff_time) {
return NT_STATUS_ACCOUNT_EXPIRED;
Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c 2006-03-17 10:22:13 UTC (rev 14506)
+++ trunk/source/nsswitch/winbindd_pam.c 2006-03-17 10:36:07 UTC (rev 14507)
@@ -746,12 +746,15 @@
return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
}
+ /* The info3 acct_flags in NT4's samlogon reply don't have
+ * ACB_NORMAL set. */
+#if 0
if (!(my_info3->acct_flags & ACB_NORMAL)) {
DEBUG(10,("winbindd_dual_pam_auth_cached: whats wrong with that one?: 0x%08x\n",
my_info3->acct_flags));
return NT_STATUS_LOGON_FAILURE;
}
-
+#endif
kickoff_time = nt_time_to_unix(&my_info3->kickoff_time);
if (kickoff_time != 0 && time(NULL) > kickoff_time) {
return NT_STATUS_ACCOUNT_EXPIRED;
More information about the samba-cvs
mailing list