svn commit: samba r9252 - in branches/SAMBA_3_0/source: auth
nsswitch
jra at samba.org
jra at samba.org
Fri Aug 12 00:05:18 GMT 2005
Author: jra
Date: 2005-08-12 00:05:17 +0000 (Fri, 12 Aug 2005)
New Revision: 9252
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9252
Log:
2 type fixes from Luke Mewburn <lukem at NetBSD.org>. Bugid #2934.
Jeremy.
Modified:
branches/SAMBA_3_0/source/auth/auth_sam.c
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_sam.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth_sam.c 2005-08-12 00:05:15 UTC (rev 9251)
+++ branches/SAMBA_3_0/source/auth/auth_sam.c 2005-08-12 00:05:17 UTC (rev 9252)
@@ -78,6 +78,7 @@
/* In logon hours first bit is Sunday from 12AM to 1AM */
const uint8 *hours;
struct tm *utctime;
+ time_t lasttime;
uint8 bitmask, bitpos;
hours = pdb_get_hours(sampass);
@@ -86,7 +87,8 @@
return True;
}
- utctime = localtime(&smb_last_time.tv_sec);
+ lasttime = (time_t)smb_last_time.tv_sec;
+ utctime = localtime(&lasttime);
/* find the corresponding byte and bit */
bitpos = (utctime->tm_wday * 24 + utctime->tm_hour) % 168;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2005-08-12 00:05:15 UTC (rev 9251)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2005-08-12 00:05:17 UTC (rev 9252)
@@ -640,7 +640,8 @@
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
char *sidstr;
char **members;
- int i, num_members;
+ int i;
+ size_t num_members;
fstring sid_string;
BOOL more_values;
const char **attrs;
More information about the samba-cvs
mailing list