summaryrefslogtreecommitdiff
path: root/packaging/Caldera/OpenServer/samba-2.2-osr5.patch
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-06-01 12:24:11 +0000
committerGerald Carter <jerry@samba.org>2001-06-01 12:24:11 +0000
commit0e40dbf86bd60f7eb057a27f56cded4f689c6747 (patch)
treeba563fed292816c03ae1253e545c6f961cbe59ca /packaging/Caldera/OpenServer/samba-2.2-osr5.patch
parent26bc8adcaa94a5a76710d1003d3828982fff33ac (diff)
downloadsamba-0e40dbf86bd60f7eb057a27f56cded4f689c6747.tar.gz
samba-0e40dbf86bd60f7eb057a27f56cded4f689c6747.tar.bz2
samba-0e40dbf86bd60f7eb057a27f56cded4f689c6747.zip
sync with SAMBA_2_2
(This used to be commit 720ec55c175bd9df5832085066d1e68b2684a8a2)
Diffstat (limited to 'packaging/Caldera/OpenServer/samba-2.2-osr5.patch')
-rw-r--r--packaging/Caldera/OpenServer/samba-2.2-osr5.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/packaging/Caldera/OpenServer/samba-2.2-osr5.patch b/packaging/Caldera/OpenServer/samba-2.2-osr5.patch
new file mode 100644
index 0000000000..fb71d9298b
--- /dev/null
+++ b/packaging/Caldera/OpenServer/samba-2.2-osr5.patch
@@ -0,0 +1,29 @@
+--- utils/torture.c.00 Fri Mar 30 13:53:26 2001
++++ utils/torture.c Fri Apr 13 15:06:04 2001
+@@ -2703,7 +2703,11 @@
+
+ dbf = stdout;
+
++#if defined(_SCO_DS) /* SCO OpenServer */
++ setvbuf(stdout, NULL, _IONBF, 0);
++#else
+ setbuffer(stdout, NULL, 0);
++#endif
+
+ charset_initialise();
+
+--- utils/locktest.c.00 Fri Sep 29 13:18:14 2000
++++ utils/locktest.c Fri Apr 13 17:54:11 2001
+@@ -384,8 +384,12 @@
+ recorded[n].conn = random() % NCONNECTIONS;
+ recorded[n].f = random() % NFILES;
+ recorded[n].start = LOCKBASE + ((unsigned)random() % (LOCKRANGE-1));
++#if defined(_SCO_DS) /* OpenServer */
++ recorded[n].len = 1;
++#else
+ recorded[n].len = 1 +
+ random() % (LOCKRANGE-(recorded[n].start-LOCKBASE));
++#endif
+ recorded[n].start *= RANGE_MULTIPLE;
+ recorded[n].len *= RANGE_MULTIPLE;
+ recorded[n].r1 = random() % 100;