Author: vlendec
Date: 2006-08-25 14:25:06 +0000 (Fri, 25 Aug 2006)
New Revision: 17831

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

Log:
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
Modified:
   branches/SAMBA_3_0/source/lib/time.c
   branches/SAMBA_3_0/source/passdb/pdb_interface.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/time.c
===================================================================
--- branches/SAMBA_3_0/source/lib/time.c        2006-08-25 12:59:03 UTC (rev 
17830)
+++ branches/SAMBA_3_0/source/lib/time.c        2006-08-25 14:25:06 UTC (rev 
17831)
@@ -223,6 +223,12 @@
                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. */

Modified: branches/SAMBA_3_0/source/passdb/pdb_interface.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_interface.c    2006-08-25 12:59:03 UTC 
(rev 17830)
+++ branches/SAMBA_3_0/source/passdb/pdb_interface.c    2006-08-25 14:25:06 UTC 
(rev 17831)
@@ -370,7 +370,7 @@
 #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

Reply via email to