diff options
author | Volker Lendecke <vlendec@samba.org> | 2006-08-25 14:25:06 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:52 -0500 |
commit | b9142f20dfb59055e05fa52c5414fb7c1877c556 (patch) | |
tree | bf5d9ca5cda1c8f2a811ff0563497545dfb10eb3 | |
parent | c3178f6a1e10cb0f1862f7bcc45ec7ccfccc571a (diff) | |
download | samba-b9142f20dfb59055e05fa52c5414fb7c1877c556.tar.gz samba-b9142f20dfb59055e05fa52c5414fb7c1877c556.tar.bz2 samba-b9142f20dfb59055e05fa52c5414fb7c1877c556.zip |
r17831: Attempt to fix the build farm: 0x7fffffffffffffff needs special casing too I
think. This broke 'make test' because the newly created user was set to be
kicked off Mi, 22 Jan 1975 23:55:33 CET (unix time 159663333) with the
setuserinfo21 call.
I'm not 100% sure that 0x7ff... means max time as I do it here, I vaguely
remember it to mean "don't touch".
Does anybody know that for sure?
Jeremy, please check this.
Thanks,
Volker
(This used to be commit 872d1299ebffb7b7d696013fc676820f1fa1777c)
-rw-r--r-- | source3/lib/time.c | 6 | ||||
-rw-r--r-- | source3/passdb/pdb_interface.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c index b4477d693a..192a418e7a 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -223,6 +223,12 @@ static struct timespec nt_time_to_unix_timespec(NTTIME *nt) return ret; } + if ((nt->high == 0x7fffffff) && (nt->low == 0xffffffff)) { + ret.tv_sec = TIME_T_MAX; + ret.tv_nsec = 0; + return ret; + } + d = (((uint64)nt->high) << 32 ) + ((uint64)nt->low); /* d is now in 100ns units, since jan 1st 1601". Save off the ns fraction. */ diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 4baddb3a93..a42f8325f6 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -370,7 +370,7 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods, #ifdef ENABLE_BUILD_FARM_HACKS if (add_ret != 0) { DEBUG(1, ("Creating a faked user %s for build farm " - "purposes", name)); + "purposes\n", name)); faked_create_user(name); } #endif |