Author: jra Date: 2005-07-04 07:48:15 +0000 (Mon, 04 Jul 2005) New Revision: 8130
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8130 Log: Add in the new lock codes discovered by tridge. We don't yet cancel locks so just use ERRnoatomiclocks at the moment. Jeremy Modified: trunk/source/include/doserr.h trunk/source/smbd/reply.c Changeset: Modified: trunk/source/include/doserr.h =================================================================== --- trunk/source/include/doserr.h 2005-07-04 07:38:51 UTC (rev 8129) +++ trunk/source/include/doserr.h 2005-07-04 07:48:15 UTC (rev 8130) @@ -63,6 +63,8 @@ #define ERRinvalidname 123 /* Invalid name */ #define ERRunknownlevel 124 #define ERRnotlocked 158 /* This region is not locked by this locking context. */ +#define ERRcancelviolation 173 +#define ERRnoatomiclocks 174 #define ERRrename 183 #define ERRbadpipe 230 /* Named pipe invalid */ #define ERRpipebusy 231 /* All instances of pipe are busy */ Modified: trunk/source/smbd/reply.c =================================================================== --- trunk/source/smbd/reply.c 2005-07-04 07:38:51 UTC (rev 8129) +++ trunk/source/smbd/reply.c 2005-07-04 07:48:15 UTC (rev 8130) @@ -5071,7 +5071,7 @@ /* we don't support these - and CANCEL_LOCK makes w2k and XP reboot so I don't really want to be compatible! (tridge) */ - return ERROR_NT(NT_STATUS_UNSUCCESSFUL); + return ERROR_DOS(ERRDOS, ERRnoatomiclocks); } if (locktype & LOCKING_ANDX_CANCEL_LOCK) {