summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-05-02 13:55:42 +0000
committerAndrew Tridgell <tridge@samba.org>2000-05-02 13:55:42 +0000
commit32d5416b6a777a7874fec8518ec44e750560d882 (patch)
treefc131a6a1693847cb20af69e4cff36941ab53f3f /source3/locking
parent88a97957e7d6547fc0a021127d1de52a132d341f (diff)
downloadsamba-32d5416b6a777a7874fec8518ec44e750560d882.tar.gz
samba-32d5416b6a777a7874fec8518ec44e750560d882.tar.bz2
samba-32d5416b6a777a7874fec8518ec44e750560d882.zip
split the username in the vuser structure into a separate
userdom_struct. As the name implies this also contains a domain (unused at the moment). This will be important shortly, as operation in appliance mode needs the domain to be always carried with the username. (This used to be commit ee8546342d5be90e730372b985710d764564b124)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/posix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 094cb87bc8..ab58607172 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -611,10 +611,10 @@ static BOOL posix_lock_in_range(SMB_OFF_T *offset_out, SMB_OFF_T *count_out,
return True;
}
+#if defined(LARGE_SMB_OFF_T)
/****************************************************************************
Pathetically try and map a 64 bit lock offset into 31 bits. I hate Windows :-).
****************************************************************************/
-
static uint32 map_lock_offset(uint32 high, uint32 low)
{
unsigned int i;
@@ -642,6 +642,7 @@ static uint32 map_lock_offset(uint32 high, uint32 low)
return (high|low);
}
+#endif
/****************************************************************************
Actual function that does POSIX locks. Copes with 64 -> 32 bit cruft and