From 49a0e6d5989656c1b3c9c063a20308ca4ee5d73b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 10 May 2000 10:41:59 +0000
Subject: more merging voodoo

this adds "#define OLD_NTDOMAIN 1" in lots of places. Don't panic -
this isn't permanent, it should go after another few merge steps have
been done
(This used to be commit 92109d7b3c06f240452d39f669ecb8c9c86ab610)
---
 source3/smbd/oplock.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/smbd/oplock.c')

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 4a363d45e9..ef43400074 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1,3 +1,5 @@
+#define OLD_NTDOMAIN 1
+
 /* 
    Unix SMB/Netbios implementation.
    Version 1.9.
@@ -1391,3 +1393,5 @@ Disabling kernel oplock support.\n", strerror(errno) ));
   }
 #endif /* HAVE_KERNEL_OPLOCKS */
 }
+
+#undef OLD_NTDOMAIN
-- 
cgit