win32 time zone changes

ulab-original
jsorg71 19 years ago
parent ae00989e75
commit 20e26f1ccd

@ -310,8 +310,13 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user,
int packetlen = 0; int packetlen = 0;
uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO; uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO;
STREAM s; STREAM s;
//time_t t = time(NULL); time_t tzone;
//time_t tzone;
#ifdef _WIN32
TIME_ZONE_INFORMATION tzi;
#else
time_t t = time(NULL);
#endif
if (!g_use_rdp5 || 1 == g_server_rdp_version) if (!g_use_rdp5 || 1 == g_server_rdp_version)
{ {
@ -335,7 +340,6 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user,
} }
else else
{ {
#if 0
flags |= RDP_LOGON_BLOB; flags |= RDP_LOGON_BLOB;
DEBUG_RDP5(("Sending RDP5-style Logon packet\n")); DEBUG_RDP5(("Sending RDP5-style Logon packet\n"));
packetlen = 4 + /* Unknown uint32 */ packetlen = 4 + /* Unknown uint32 */
@ -415,7 +419,12 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user,
out_uint16_le(s, len_dll + 2); out_uint16_le(s, len_dll + 2);
rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", len_dll); rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", len_dll);
#ifdef _WIN32
GetTimeZoneInformation(&tzi);
tzone = tzi.Bias;
#else
tzone = (mktime(gmtime(&t)) - mktime(localtime(&t))) / 60; tzone = (mktime(gmtime(&t)) - mktime(localtime(&t))) / 60;
#endif
out_uint32_le(s, tzone); out_uint32_le(s, tzone);
rdp_out_unistr(s, "GTB, normaltid", 2 * strlen("GTB, normaltid")); rdp_out_unistr(s, "GTB, normaltid", 2 * strlen("GTB, normaltid"));
@ -438,8 +447,6 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user,
out_uint32_le(s, 0xfffffffe); out_uint32_le(s, 0xfffffffe);
out_uint32_le(s, g_rdp5_performanceflags); out_uint32_le(s, g_rdp5_performanceflags);
out_uint32(s, 0); out_uint32(s, 0);
#endif
} }
s_mark_end(s); s_mark_end(s);
sec_send(s, sec_flags); sec_send(s, sec_flags);

Loading…
Cancel
Save