From Tim Potter: add the DOS error for "file already exists" on a

rename.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4333 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index cb751e3e9aefe9b7810b22d773dba2f0cf6bf61b..7fdb06e67154a9082501db787f65606886893459 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -913,6 +913,7 @@ Tim Potter <tpot[AT]samba.org> {
            extract the FID from them
        Use the FID, for DCE RPC-over-SMB, as part of the conversation
           matching
+       Assorted SMB fixes
 }
 
 Raghu Angadi <rangadi[AT]inktomi.com> {

diff --git a/packet-smb.c b/packet-smb.c
index bc08a07e501aa49a5ebf61f7b27c7db7d634ff9a..e9b3eb529e194cbd8014288b0363915af7ff1b54 100644 (file)
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb.c,v 1.177 2001/12/05 00:25:44 guy Exp $
+ * $Id: packet-smb.c,v 1.178 2001/12/05 00:49:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -11754,6 +11754,7 @@ static const value_string DOS_errors[] = {
   {SMBE_notify_buf_small, "Buffer too small to return change notify."},
   {SMBE_unknownipc, "Unknown IPC Operation"},
   {SMBE_noipc, "Don't support ipc"},
+  {SMBE_alreadyexists, "File already exists"},
   {0, NULL}
   };
 

diff --git a/smb.h b/smb.h
index a82f6e96fad2d7fabe1e1096b8f59c3109ce95a2..1c6d8aeb8789d398f479195c5a52125e1a6850d6 100644 (file)
--- a/smb.h
+++ b/smb.h
@@ -2,7 +2,7 @@
  * Defines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: smb.h,v 1.27 2001/11/28 11:33:55 guy Exp $
+ * $Id: smb.h,v 1.28 2001/12/05 00:49:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -138,6 +138,7 @@
 #define SMBE_filexists 80          /* File in operation already exists */
 #define SMBE_cannotopen 110        /* Cannot open the file specified */
 #define SMBE_unknownlevel 124
+#define SMBE_alreadyexists 183     /* File already exists */
 #define SMBE_badpipe 230           /* Named pipe invalid */
 #define SMBE_pipebusy 231          /* All instances of pipe are busy */
 #define SMBE_pipeclosing 232       /* named pipe close in progress */