svn commit: samba r9251 - in trunk/source: auth nsswitch

[jra at samba.org]

Author: jra
Date: 2005-08-12 00:05:15 +0000 (Fri, 12 Aug 2005)
New Revision: 9251

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9251

Log:
2 type fixes from Luke Mewburn <lukem at NetBSD.org>. Bugid #2934.
Jeremy.

Modified:
   trunk/source/auth/auth_sam.c
   trunk/source/nsswitch/winbindd_ads.c


Changeset:
Modified: trunk/source/auth/auth_sam.c
===================================================================
--- trunk/source/auth/auth_sam.c	2005-08-11 23:39:52 UTC (rev 9250)
+++ trunk/source/auth/auth_sam.c	2005-08-12 00:05:15 UTC (rev 9251)
@@ -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: trunk/source/nsswitch/winbindd_ads.c
===================================================================
--- trunk/source/nsswitch/winbindd_ads.c	2005-08-11 23:39:52 UTC (rev 9250)
+++ trunk/source/nsswitch/winbindd_ads.c	2005-08-12 00:05:15 UTC (rev 9251)
@@ -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;