sync with SAMBA_2_2
[kai/samba.git] / packaging / Caldera / OpenServer / samba-2.2-osr5.patch
1 --- utils/torture.c.00  Fri Mar 30 13:53:26 2001
2 +++ utils/torture.c     Fri Apr 13 15:06:04 2001
3 @@ -2703,7 +2703,11 @@
4  
5         dbf = stdout;
6  
7 +#if defined(_SCO_DS) /* SCO OpenServer */
8 +    setvbuf(stdout, NULL, _IONBF, 0);
9 +#else
10         setbuffer(stdout, NULL, 0);
11 +#endif
12  
13         charset_initialise();
14  
15 --- utils/locktest.c.00 Fri Sep 29 13:18:14 2000
16 +++ utils/locktest.c    Fri Apr 13 17:54:11 2001
17 @@ -384,8 +384,12 @@
18                         recorded[n].conn = random() % NCONNECTIONS;
19                         recorded[n].f = random() % NFILES;
20                         recorded[n].start = LOCKBASE + ((unsigned)random() % (LOCKRANGE-1));
21 +#if defined(_SCO_DS) /* OpenServer */
22 +                       recorded[n].len = 1;
23 +#else
24                         recorded[n].len = 1 + 
25                                 random() % (LOCKRANGE-(recorded[n].start-LOCKBASE));
26 +#endif
27                         recorded[n].start *= RANGE_MULTIPLE;
28                         recorded[n].len *= RANGE_MULTIPLE;
29                         recorded[n].r1 = random() % 100;