diff options
author | Jeremy Allison <jra@samba.org> | 2001-03-11 00:32:10 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-03-11 00:32:10 +0000 |
commit | da3053048c3d224a20d6383ac6682d31059cd46c (patch) | |
tree | e0608d0bb47fcf3b6228db16507d3263afb869bd /source3/smbd/oplock_irix.c | |
parent | 1af77d39fa69d201be739e379d8bf4a370fc2df1 (diff) | |
download | samba-da3053048c3d224a20d6383ac6682d31059cd46c.tar.gz samba-da3053048c3d224a20d6383ac6682d31059cd46c.tar.bz2 samba-da3053048c3d224a20d6383ac6682d31059cd46c.zip |
Merge of new 2.2 code into HEAD (Gerald I hate you :-) :-). Allows new SAMR
RPC code to merge with new passdb code.
Currently rpcclient doesn't compile. I'm working on it...
Jeremy.
(This used to be commit 0be41d5158ea4e645e93e8cd30617c038416e549)
Diffstat (limited to 'source3/smbd/oplock_irix.c')
-rw-r--r-- | source3/smbd/oplock_irix.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index cf1cbbb0fc..faf7e8e3c8 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -1,6 +1,4 @@ -#define OLD_NTDOMAIN 1 - -/* +/* Unix SMB/Netbios implementation. Version 2.x IRIX kernel oplock processing @@ -278,5 +276,3 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void) #else void oplock_irix_dummy(void) {} #endif /* HAVE_KERNEL_OPLOCKS_IRIX */ - -#undef OLD_NTDOMAIN |