diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-06 18:32:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:43:56 -0500 |
| commit | 995205fc60f87e1a02aa1c6f309db55ae18e908a (patch) | |
| tree | bf796212b1c95b755ef07b1a91b7e26e45dbbd87 /source3/nsswitch/winbindd_cache.c | |
| parent | a7be2ec7c5eb8bda76eaec0eaff7e1a7b2b39433 (diff) | |
| download | samba-995205fc60f87e1a02aa1c6f309db55ae18e908a.tar.gz samba-995205fc60f87e1a02aa1c6f309db55ae18e908a.tar.bz2 samba-995205fc60f87e1a02aa1c6f309db55ae18e908a.zip | |
r18188: merge 3.0-libndr branch
(This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
Diffstat (limited to 'source3/nsswitch/winbindd_cache.c')
| -rw-r--r-- | source3/nsswitch/winbindd_cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c index e93dcefc90..27d37267b5 100644 --- a/source3/nsswitch/winbindd_cache.c +++ b/source3/nsswitch/winbindd_cache.c @@ -215,9 +215,9 @@ static NTTIME centry_nttime(struct cache_entry *centry) centry->len - centry->ofs)); smb_panic("centry_nttime"); } - ret.low = IVAL(centry->data, centry->ofs); + ret = IVAL(centry->data, centry->ofs); centry->ofs += 4; - ret.high = IVAL(centry->data, centry->ofs); + ret += (uint64_t)IVAL(centry->data, centry->ofs) << 32; centry->ofs += 4; return ret; } @@ -685,9 +685,9 @@ static void centry_put_sid(struct cache_entry *centry, const DOM_SID *sid) static void centry_put_nttime(struct cache_entry *centry, NTTIME nt) { centry_expand(centry, 8); - SIVAL(centry->data, centry->ofs, nt.low); + SIVAL(centry->data, centry->ofs, nt & 0xFFFFFFFF); centry->ofs += 4; - SIVAL(centry->data, centry->ofs, nt.high); + SIVAL(centry->data, centry->ofs, nt >> 32); centry->ofs += 4; } |