Wireshark · Ethereal-dev: [Ethereal-dev] Updates to the NDPS dissector

["Greg Morris" <gmorris@xxxxxxxxxx>]

Fixes proper decoding of extended error 2 values

Also adds a number of additional error codes/values

Index: packet-ndps.c
===================================================================
--- packet-ndps.c	(revision 16570)
+++ packet-ndps.c	(working copy)
@@ -342,6 +342,7 @@
 static int hf_notify_printer_uri = -1;
 static int hf_level = -1;
 static int hf_interval = -1;
+static int hf_ndps_other_error_string = -1;
 
 static int hf_spx_ndps_program = -1;
 static int hf_spx_ndps_version = -1;
@@ -1210,6 +1211,22 @@
 static const value_string ndps_error_types[] = {
     { 0x00000000, "Ok" },
     { 0x00000001, "Error" },
+    { 0x01000001, "Invalid Parameter" },
+    { 0x01000002, "Parameter Value Unrecognized" },
+    { 0x01000003, "Call Back Error" },
+    { 0x01000004, "Standard IO Error" },
+    { 0x01000005, "NDS Error" },
+    { 0x01000006, "Unicode Error" },
+    { 0x01000007, "Invalid Operator" },
+    { 0x01000009, "Parameter Value Unsupported" },
+    { 0x0100000a, "Windows Error" },
+    { 0x0100000b, "WSA Last Error" },
+    { 0x0100000c, "SLP Error" },
+    { 0x0100000d, "NetWare Client Error" },
+    { 0x03000005, "NDS Error with Position" },
+    { 0x030a0001, "No Memory" },
+    { 0x030a0009, "Artificial Memory Limit" },
+    { 0x030a000c, "Memory Allocated with Wrong NLM ID" },
     { 0xFFFFFC18, "Broker Out of Memory" },      /* Broker Errors */
     { 0xFFFFFC17, "Broker Bad NetWare Version" },
     { 0xFFFFFC16, "Broker Wrong Command Line Arguments" },
@@ -1532,6 +1549,395 @@
     { 0xFFFFFC6F, "Database Object Exists" },
     { 0xFFFFFC6E, "Database Descriptor In Use" },
     { 0xFFFFFC6D, "Database Descriptor Being Deleted" },
+    { 0xffffffff, "(-1) Insufficient Space" },
+    { 0xffffff89, "(-119) Buffer too Small" },
+    { 0xffffff88, "(-120) RR Volume Flag Not Set" },
+    { 0xffffff87, "(-121) No Items Found" },
+    { 0xffffff86, "(-122) Connection Already Temporary" },
+    { 0xffffff85, "(-123) Connection Already Logged In" },
+    { 0xffffff84, "(-124) Connection Not Authenticated" },
+    { 0xffffff83, "(-125) Connection Not Logged In" },
+    { 0xffffff82, "(-126) NCP Boundary Check Failed" },
+    { 0xffffff81, "(-127) Lock Waiting" },
+    { 0xffffff80, "(-128) Lock Fail" },
+    { 0xffffff7f, "(-129) Out of Handles" },
+    { 0xffffff7e, "(-130) No Open Privilege" },
+    { 0xffffff7d, "(-131) Hard IO Error" },
+    { 0xffffff7c, "(-132) No Create Privilege" },
+    { 0xffffff7b, "(-133) No Create Delete Privilege" },
+    { 0xffffff7a, "(-134) Create Duplicate When Read Only" },
+    { 0xffffff79, "(-135) Create File with Invalid Name" },
+    { 0xffffff78, "(-136) Invalid File Handle" },
+    { 0xffffff77, "(-137) No Search Privilege"   },
+    { 0xffffff76, "(-138) No Delete Privilege" },
+    { 0xffffff75, "(-139) No Rename Privilege" },
+    { 0xffffff74, "(-140) No Set Privilege" },
+    { 0xffffff73, "(-141) Some File in Use" },
+    { 0xffffff72, "(-142) All File in Use" },
+    { 0xffffff71, "(-143) Some Read Only" },
+    { 0xffffff70, "(-144) All Read Only" },
+    { 0xffffff6f, "(-145) Some names Exist" },
+    { 0xffffff6e, "(-146) All Names Exist" },
+    { 0xffffff6d, "(-147) No Read Privilege" },
+    { 0xffffff6c, "(-148) No Write Privilege" },
+    { 0xffffff6b, "(-149) File Detached" },
+    { 0xffffff6a, "(-150) No Alloc Space/Target Not a Subdirectory/Insuffficient Memory" },
+    { 0xffffff69, "(-151) No Spool Space" },
+    { 0xffffff68, "(-152) Invalid Volume" },
+    { 0xffffff67, "(-153) Directory Full" },
+    { 0xffffff66, "(-154) Rename Across Volume" },
+    { 0xffffff65, "(-155) Bad Directory Handle" },
+    { 0xffffff64, "(-156) Invalid Path/No Such Extension" },
+    { 0xffffff63, "(-157) No Directory Handles" },
+    { 0xffffff62, "(-158) Bad File Name" },
+    { 0xffffff61, "(-159) Directory Active" },
+    { 0xffffff60, "(-160) Directory Not Empty" },
+    { 0xffffff5f, "(-161) Directory IO Error" },
+    { 0xffffff5e, "(-162) IO Locked" },
+    { 0xffffff5d, "(-163) Transaction Restarted" },
+    { 0xffffff5c, "(-164) Rename Directory Invalid" },
+    { 0xffffff5b, "(-165) Invalid Open/Create Mode" },
+    { 0xffffff5a, "(-166) Already in Use" },
+    { 0xffffff59, "(-167) Invalid Resource Tag" },
+    { 0xffffff58, "(-168) Access Denied" },
+    { 0xffffff44, "(-188) Login Signing Required" },
+    { 0xffffff43, "(-189) Login Encryption Required" },
+    { 0xffffff42, "(-190) Invalid Data Stream" },
+    { 0xffffff41, "(-191) Invalid Name Space" },
+    { 0xffffff40, "(-192) No Accounting Privileges" },
+    { 0xffffff3f, "(-193) No Account Balance" },
+    { 0xffffff3e, "(-194) Credit Limit Exceeded" },
+    { 0xffffff3d, "(-195) Too Many Holds" },
+    { 0xffffff3c, "(-196) Accounting Disabled" },
+    { 0xffffff3b, "(-197) Intruder Login Lockout" },
+    { 0xffffff3a, "(-198) No Console Rights" },
+    { 0xffffff30, "(-208) Queue IO Failure" },
+    { 0xffffff2f, "(-209) No Queue" },
+    { 0xffffff2e, "(-210) No Queue Server" },
+    { 0xffffff2d, "(-211) No Queue Rights" },
+    { 0xffffff2c, "(-212) Queue Full" },
+    { 0xffffff2b, "(-213) No Queue Job" },
+    { 0xffffff2a, "(-214) No Queue Job Rights/Unencrypted Not Allowed" },
+    { 0xffffff29, "(-215) Queue In Service/Duplicate Password" },
+    { 0xffffff28, "(-216) Queue Not Active/Password Too Short" },
+    { 0xffffff27, "(-217) Queue Station Not Server/Maximum Logins Exceeded" },
+    { 0xffffff26, "(-218) Queue Halted/Bad Login Time" },
+    { 0xffffff25, "(-219) Queue Maximum Servers/Node Address Violation" },
+    { 0xffffff24, "(-220) Login Account Expired" },
+    { 0xffffff22, "(-222) Bad Password" },
+    { 0xffffff21, "(-223) Password Expired" },
+    { 0xffffff20, "(-224) No Login Connection Available" },
+    { 0xffffff18, "(-232) Write to Group Property" },
+    { 0xffffff17, "(-233) Member Already Exists" },
+    { 0xffffff16, "(-234) No Such Member" },
+    { 0xffffff15, "(-235) Property Not Group" },
+    { 0xffffff14, "(-236) No Such Value Set" },
+    { 0xffffff13, "(-237) Property Already Exists" },
+    { 0xffffff12, "(-238) Object Already Exists" },
+    { 0xffffff11, "(-239) Illegal Name" },
+    { 0xffffff10, "(-240) Illegal Wildcard" },
+    { 0xffffff0f, "(-241) Bindery Security" },
+    { 0xffffff0e, "(-242) No Object Read Rights" },
+    { 0xffffff0d, "(-243) No Object Rename Rights" },
+    { 0xffffff0c, "(-244) No Object Delete Rights" },
+    { 0xffffff0b, "(-245) No Object Create Rights" },
+    { 0xffffff0a, "(-246) No Property Delete Rights" },
+    { 0xffffff09, "(-247) No Property Create Rigths" },
+    { 0xffffff08, "(-248) No Property Write Rights" },
+    { 0xffffff07, "(-249) No Propery Read Rights" },
+    { 0xffffff06, "(-250) Temp Remap" },
+    { 0xffffff05, "(-251) Unknown Request/No Such Property" },
+    { 0xffffff04, "(-252) Message Queue Full/Target Already Has Message/No Such Object" },
+    { 0xffffff03, "(-253) Bad Station Number" },
+    { 0xffffff02, "(-254) Bindery Locked/Directory Locked/Spool Delete/Trustee not Found/Timeout" },
+    { 0xffffff01, "(-255) Hard Failure" },
+    { 0xfffffed3, "(-301) Not Enough Memory" },
+    { 0xfffffed2, "(-302) Bad Key" },
+    { 0xfffffed1, "(-303) Bad Context" },
+    { 0xfffffed0, "(-304) Buffer Full" },
+    { 0xfffffecf, "(-305) List Empty" },
+    { 0xfffffece, "(-306) Bad Syntax"   },
+    { 0xfffffecd, "(-307) Buffer Empty" },
+    { 0xfffffecc, "(-308) Bad Verb" },
+    { 0xfffffecb, "(-309) Expected Identifier" },
+    { 0xfffffeca, "(-310) Expected Equals" },
+    { 0xfffffec9, "(-311) Attribute Type Expected" },
+    { 0xfffffec8, "(-312) Attribute Type Not Expected" },
+    { 0xfffffec7, "(-313) Filter Tree Empty" },
+    { 0xfffffec6, "(-314) Invalid Object Name" },
+    { 0xfffffec5, "(-315) Expected RDN Delimiter" },
+    { 0xfffffec4, "(-316) Too Many Tokens" },
+    { 0xfffffec3, "(-317) Inconsistent MultiAVA" },
+    { 0xfffffec2, "(-318) Country Name Too Long" },
+    { 0xfffffec1, "(-319) Internal Error" },
+    { 0xfffffec0, "(-320) Can't Add Root" },
+    { 0xfffffebf, "(-321) Unable to Attach" },
+    { 0xfffffebe, "(-322) Invalid Iteration Handle" },
+    { 0xfffffebd, "(-323) Buffer Zero Length" },
+    { 0xfffffebc, "(-324) Invalid Replica Type" },
+    { 0xfffffebb, "(-325) Invalid Attribute Syntax" },
+    { 0xfffffeba, "(-326) Invalid Filter Syntax" },
+    { 0xfffffeb8, "(-328) Unicode Error during Context Creation" },
+    { 0xfffffeb7, "(-329) Invalid Union Tag" },
+    { 0xfffffeb6, "(-330) Invalid Server Response" },
+    { 0xfffffeb5, "(-331) Null Pointer" },
+    { 0xfffffeb4, "(-332) No Server Found" },
+    { 0xfffffeb3, "(-333) No Connection" },
+    { 0xfffffeb2, "(-334) RDN Too Long" },
+    { 0xfffffeb1, "(-335) Duplicate Type" },
+    { 0xfffffeb0, "(-336) Data Store Failure" },
+    { 0xfffffeaf, "(-337) Not Logged In" },
+    { 0xfffffeae, "(-338) Invalid Password Characters" },
+    { 0xfffffead, "(-339) Failed Server Authentication" },
+    { 0xfffffeac, "(-340) Transport Failed" },
+    { 0xfffffeab, "(-341) No Such Syntax" },
+    { 0xfffffeaa, "(-342) Invalid DS Name" },
+    { 0xfffffea9, "(-343) Attribute Name Too Long" },
+    { 0xfffffea8, "(-344) Invalid TDS" },
+    { 0xfffffea7, "(-345) Invalid DS Version" },
+    { 0xfffffea6, "(-346) Unicode Translation" },
+    { 0xfffffea5, "(-347) Schema Name Too Long" },
+    { 0xfffffea4, "(-348) Unicode File Not Found" },
+    { 0xfffffea3, "(-349) Unicode Already Loaded" },
+    { 0xfffffea2, "(-350) Not Context Owner" },
+    { 0xfffffea1, "(-351) Attempt to Authenticate" },
+    { 0xfffffea0, "(-352) No Writable Replicas" },
+    { 0xfffffe9f, "(-353) DN Too Long" },
+    { 0xfffffe9e, "(-354) Rename Not Allowed" },
+    { 0xfffffe9d, "(-355) Not NDS for NT" },
+    { 0xfffffe9c, "(-356) NDS for NT - No Domain" },
+    { 0xfffffe9b, "(-357) NDS for NT - Sync Disabled" },
+    { 0xfffffe9a, "(-358) Iterator Invalid Handle" },
+    { 0xfffffe99, "(-359) Iterator Invalid Position" },
+    { 0xfffffe98, "(-360) Iterator Invalid Search Data" },
+    { 0xfffffe97, "(-361) Iterator Invalid Scope" },
+    { 0xfffffda7, "(-601) No Such Entry" },
+    { 0xfffffda6, "(-602) No Such Value" },
+    { 0xfffffda5, "(-603) No Such Attribute" },
+    { 0xfffffda4, "(-604) No Such Class" },
+    { 0xfffffda3, "(-605) No Such Partition" },
+    { 0xfffffda2, "(-606) Entry Already Exists" },
+    { 0xfffffda1, "(-607) Not Effective Class" },
+    { 0xfffffda0, "(-608) Illegal Attribute" },
+    { 0xfffffd9f, "(-609) Missing Mandatory" },
+    { 0xfffffd9e, "(-610) Illegal DS Name" },
+    { 0xfffffd9d, "(-611) Illegal Containment" },
+    { 0xfffffd9c, "(-612) Can't Have Multiple Values" },
+    { 0xfffffd9b, "(-613) Syntax Violation" },
+    { 0xfffffd9a, "(-614) Duplicate Value" },
+    { 0xfffffd99, "(-615) Attribute Already Exists" },
+    { 0xfffffd98, "(-616) Maximum Entries Exist" },
+    { 0xfffffd97, "(-617) Database Format" },
+    { 0xfffffd96, "(-618) Inconsistent Database" },
+    { 0xfffffd95, "(-619) Invalid Comparison" },
+    { 0xfffffd94, "(-620) Comparison Failed" },
+    { 0xfffffd93, "(-621) Transaction Tracking Disabled" },
+    { 0xfffffd92, "(-622) Invalid Transport" },
+    { 0xfffffd91, "(-623) Syntax Invalid in Name" },
+    { 0xfffffd90, "(-624) Replica Already Exists" },
+    { 0xfffffd8f, "(-625) Transport Failure" },
+    { 0xfffffd8e, "(-626) All Referrals Failed" },
+    { 0xfffffd8d, "(-627) Can't Remove Naming Value" },
+    { 0xfffffd8c, "(-628) Object Class Violation" },
+    { 0xfffffd8b, "(-629) Entry is Not Leaf" },
+    { 0xfffffd8a, "(-630) Different Tree" },
+    { 0xfffffd89, "(-631) Illegal Replica Type" },
+    { 0xfffffd88, "(-632) System Failure" },
+    { 0xfffffd87, "(-633) Invalid Entry for Root" },
+    { 0xfffffd86, "(-634) No Referrals" },
+    { 0xfffffd85, "(-635) Remote Failure" },
+    { 0xfffffd84, "(-636) Unreachable Server" },
+    { 0xfffffd83, "(-637) Previous Move in Progress" },
+    { 0xfffffd82, "(-638) No Character Mapping" },
+    { 0xfffffd81, "(-639) Incomplete Authentication" },
+    { 0xfffffd80, "(-640) Invalid Certificate" },
+    { 0xfffffd7f, "(-641) Invalid Request" },
+    { 0xfffffd7e, "(-642) Invalid Iteration" },
+    { 0xfffffd7d, "(-643) Schema is Non-removable" },
+    { 0xfffffd7c, "(-644) Schema is in Use" },
+    { 0xfffffd7b, "(-645) Class Already Exists" },
+    { 0xfffffd7a, "(-646) Bad Naming Attributes" },
+    { 0xfffffd79, "(-647) Not Root Partition" },
+    { 0xfffffd78, "(-648) Insufficient Stack" },
+    { 0xfffffd77, "(-649) Insufficient Buffer" },
+    { 0xfffffd76, "(-650) Ambiguous Containment" },
+    { 0xfffffd75, "(-651) Ambiguous Naming" },
+    { 0xfffffd74, "(-652) Duplicate Mandatory" },
+    { 0xfffffd73, "(-653) Duplicate Optional" },
+    { 0xfffffd72, "(-654) Partition Busy" },
+    { 0xfffffd71, "(-655) Multiple Replicas" },
+    { 0xfffffd70, "(-656) Crucial Replica" },
+    { 0xfffffd6f, "(-657) Schema Sync in Progress" },
+    { 0xfffffd6e, "(-658) Skulk in Progress" },
+    { 0xfffffd6d, "(-659) Time Not Synchronized" },
+    { 0xfffffd6c, "(-660) Record in Use" },
+    { 0xfffffd6b, "(-661) DS Volume Not Mounted" },
+    { 0xfffffd6a, "(-662) DS Volume IO Failure" },
+    { 0xfffffd69, "(-663) DS Locked" },
+    { 0xfffffd68, "(-664) Old Epoch" },
+    { 0xfffffd67, "(-665) New Epoch" },
+    { 0xfffffd66, "(-666) Incompatible DS Version" },
+    { 0xfffffd65, "(-667) Partition Root" },
+    { 0xfffffd64, "(-668) Entry Not Container" },
+    { 0xfffffd63, "(-669) Failed Authentication" },
+    { 0xfffffd62, "(-670) Invalid Context" },
+    { 0xfffffd61, "(-671) No Such Parent" },
+    { 0xfffffd60, "(-672) No Access" },
+    { 0xfffffd5f, "(-673) Replica Not On" },
+    { 0xfffffd5e, "(-674) Invalid Name Service" },
+    { 0xfffffd5d, "(-675) Invalid Task" },
+    { 0xfffffd5c, "(-676) Invalide Connection Handle" },
+    { 0xfffffd5b, "(-677) Invalid Identity" },
+    { 0xfffffd5a, "(-678) Duplicate ACL" },
+    { 0xfffffd59, "(-679) Partition Already Exists" },
+    { 0xfffffd58, "(-680) Transport Modified" },
+    { 0xfffffd57, "(-681) Alias of an Alias" },
+    { 0xfffffd56, "(-682) Auditing Failed" },
+    { 0xfffffd55, "(-683) Invalid API Version" },
+    { 0xfffffd54, "(-684) Secure NCP Violation" },
+    { 0xfffffd53, "(-685) Move in Progress" },
+    { 0xfffffd52, "(-686) Not a Leaf Partition" },
+    { 0xfffffd51, "(-687) Cannot Abort" },
+    { 0xfffffd50, "(-688) Cache Overflow" },
+    { 0xfffffd4f, "(-689) Invalid Subordinate Count" },
+    { 0xfffffd4e, "(-690) Invalid RDN" },
+    { 0xfffffd4d, "(-691) Modification Time Not Current" },
+    { 0xfffffd4c, "(-692) Incorrect Base Class" },
+    { 0xfffffd4b, "(-693) Missing Reference" },
+    { 0xfffffd4a, "(-694) Lost Entry" },
+    { 0xfffffd49, "(-695) Agent Already Registered" },
+    { 0xfffffd48, "(-696) DS Loader Busy" },
+    { 0xfffffd47, "(-697) DS Cannot Reload" },
+    { 0xfffffd46, "(-698) Replica in Skulk" },
+    { 0xfffffd45, "(-699) Fatal" },
+    { 0xfffffd44, "(-700) Obsolete API" },
+    { 0xfffffd43, "(-701) Synchronization Disabled" },
+    { 0xfffffd42, "(-702) Invalid Parameter" },
+    { 0xfffffd41, "(-703) Duplicate Template" },
+    { 0xfffffd40, "(-704) No Master Replica" },
+    { 0xfffffd3f, "(-705) Duplicate Containment" },
+    { 0xfffffd3e, "(-706) Not a Sibling" },
+    { 0xfffffd3d, "(-707) Invalid Signature" },
+    { 0xfffffd3c, "(-708) Invalid Response" },
+    { 0xfffffd3b, "(-709) Insufficient Sockets" },
+    { 0xfffffd3a, "(-710) Database Read Fail" },
+    { 0xfffffd39, "(-711) Invalid Code Page" },
+    { 0xfffffd38, "(-712) Invalid Escape Character" },
+    { 0xfffffd37, "(-713) Invalide Delimiters" },
+    { 0xfffffd36, "(-714) Not Implemented" },
+    { 0xfffffd35, "(-715) Checksum Failure" },
+    { 0xfffffd34, "(-716) Checksumming Not Supported" },
+    { 0xfffffd33, "(-717) CRC Failure" },
+    { 0xfffffd32, "(-718) Invalid Entry Handle" },
+    { 0xfffffd31, "(-719) Invalid Value Handle" },
+    { 0xfffffd30, "(-720) Connection Denied" },
+    { 0xfffffd2f, "(-721) No Such Federation Link" },
+    { 0xfffffd2e, "(-722) Operetational Schema Mismatch" },
+    { 0xfffffd2d, "(-723) Stream Not Found" },
+    { 0xfffffd2c, "(-724) DClient Unavailable" },
+    { 0xfffffd2b, "(-725) MASV No Access" },
+    { 0xfffffd2a, "(-726) MASV Invalid Request" },
+    { 0xfffffd29, "(-727) MASV Failure" },
+    { 0xfffffd28, "(-728) MASV Already Exists" },
+    { 0xfffffd27, "(-729) MASV Not Found" },
+    { 0xfffffd26, "(-730) MASV Bad Range" },
+    { 0xfffffd25, "(-731) Value Data" },
+    { 0xfffffd24, "(-732) Database Locked" },
+    { 0xfffffd21, "(-735) Nothing to Abort" },
+    { 0xfffffd20, "(-736) End of Stream" },
+    { 0xfffffd1f, "(-737) No Such Template" },
+    { 0xfffffd1e, "(-738) SAS Locked" },
+    { 0xfffffd1d, "(-739) Invalid SAS Version" },
+    { 0xfffffd1c, "(-740) SAS Already Registered" },
+    { 0xfffffd1b, "(-741) Name Type Not Supported" },
+    { 0xfffffd1a, "(-742) Wrong DS Version" },
+    { 0xfffffd19, "(-743) Invalid Control Function" },
+    { 0xfffffd18, "(-744) Invalid Control State" },
+    { 0xfffffd17, "(-745) Cache in Use" },
+    { 0xfffffd16, "(-746) Zero Creation Time" },
+    { 0xfffffd15, "(-747) Would Block" },
+    { 0xfffffd14, "(-748) Connection Timeout" },
+    { 0xfffffd13, "(-749) Too Many Referrals" },
+    { 0xfffffd12, "(-750) Operation Cancelled" },
+    { 0xfffffd11, "(-751) Unknown Target" },
+    { 0xfffffd10, "(-752) GUID Failure" },
+    { 0xfffffd0f, "(-753) Incompatible OS" },
+    { 0xfffffd0e, "(-754) Callback Cancel" },
+    { 0xfffffd0d, "(-755) Invalid Synchronization Data" },
+    { 0xfffffd0c, "(-756) Stream Exists" },
+    { 0xfffffd0b, "(-757) Auxiliary Has Containment" },
+    { 0xfffffd0a, "(-758) Auxiliary Not Container" },
+    { 0xfffffd09, "(-759) Auxiliary Not Effective" },
+    { 0xfffffd08, "(-760) Auxiliary On Alias" },
+    { 0xfffffd07, "(-761) Have Seen State" },
+    { 0xfffffd06, "(-762) Verb Locked" },
+    { 0xfffffd05, "(-763) Verb Exceeds Table Length" },
+    { 0xfffffd04, "(-764) BOF Hit" },
+    { 0xfffffd03, "(-765) EOF Hit" },
+    { 0xfffffd02, "(-766) Incompatible Replica Version" },
+    { 0xfffffd01, "(-767) Query Timeout" },
+    { 0xfffffd00, "(-768) Query Maximum Count" },
+    { 0xfffffcff, "(-769) Duplicate Naming" },
+    { 0xfffffcfe, "(-770) No Transaction Active" },
+    { 0xfffffcfd, "(-771) Transaction Active" },
+    { 0xfffffcfc, "(-772) Illegal Transaction Operation" },
+    { 0xfffffcfb, "(-773) Iterator Syntax" },
+    { 0xfffffcfa, "(-774) Repairing DIB" },
+    { 0xfffffcf9, "(-775) Invalid OID Format" },
+    { 0xfffffcf8, "(-776) Attempted to perform an NDS operation, and the DS agent on this server is closing" },
+    { 0xfffffcf7, "(-777) Attempted to modify an object's attribute that is not stored on the sparse replica" },
+    { 0xfffffcf6, "(-778) VpVector and VpvUser which must be correlated, are out of sync" },
+    { 0xfffffcf5, "(-779) Error Cannot Go Remote" },
+    { 0xfffffcf4, "(-780) Request not Supported" },
+    { 0xfffffcf3, "(-781) Entry Not Local" },
+    { 0xfffffcf2, "(-782) Root Unreachable" },
+    { 0xfffffcf1, "(-783) VRDIM Not Initialized" },
+    { 0xfffffcf0, "(-784) Wait Timeout" },
+    { 0xfffffcef, "(-785) DIB Error" },
+    { 0xfffffcee, "(-786) DIB IO Failure" },
+    { 0xfffffced, "(-787) Illegal Schema Attribute" },
+    { 0xfffffcec, "(-788) Error Schema Partition" },
+    { 0xfffffceb, "(-789) Invalid Template" },
+    { 0xfffffcea, "(-790) Error Opening File" },
+    { 0xfffffce9, "(-791) Error Direct Opening File" },
+    { 0xfffffce8, "(-792) Error Creating File" },
+    { 0xfffffce7, "(-793) Error Direct Creating File" },
+    { 0xfffffce6, "(-794) Error Reading File" },
+    { 0xfffffce5, "(-795) Error Direct Reading File" },
+    { 0xfffffce4, "(-796) Error Writing File" },
+    { 0xfffffce3, "(-797) Error Direct Writing File" },
+    { 0xfffffce2, "(-798) Error Positioning in File" },
+    { 0xfffffce1, "(-799) Error Getting File Size" },
+    { 0xffffe88f, "(-6001) Error Truncating File" },
+    { 0xffffe88e, "(-6002) Error Parsing File Name" },
+    { 0xffffe88d, "(-6003) Error Closing File" },
+    { 0xffffe88c, "(-6004) Error Getting File Info" },
+    { 0xffffe88b, "(-6005) Error Expanding File" },
+    { 0xffffe88a, "(-6006) Error Getting Free Blocks" },
+    { 0xffffe889, "(-6007) Error Checking File Existence" },
+    { 0xffffe888, "(-6008) Error Deleting File" },
+    { 0xffffe887, "(-6009) Error Renaming File" },
+    { 0xffffe886, "(-6010) Error Initializing IO System" },
+    { 0xffffe885, "(-6011) Error Flushing File" },
+    { 0xffffe884, "(-6012) Error Setting Up for Read" },
+    { 0xffffe883, "(-6013) Error Setting up for Write" },
+    { 0xffffe882, "(-6014) Error Old View" },
+    { 0xffffe881, "(-6015) Server in Skulk" },
+    { 0xffffe880, "(-6016) Error Returning Partial Results" },
+    { 0xffffe87f, "(-6017) No Such Schema" },
+    { 0xffffe87e, "(-6018) Serial Number Mismatch" },
+    { 0xffffe87d, "(-6019) Bad Referal Database Serial Number" },
+    { 0xffffe87c, "(-6020) Bad Referal Serial Number" },
+    { 0xffffe87b, "(-6021) Invalid File Sequence" },
+    { 0xffffe87a, "(-6022) Error Referal Trans Gap" },
+    { 0xffffe879, "(-6023) Bad Referal File Number" },
+    { 0xffffe878, "(-6024) Referal File Not Found" },
+    { 0xffffe877, "(-6025) Error Backup Active" },
+    { 0xffffe876, "(-6026) Referal Device Full" },
+    { 0xffffe875, "(-6027) Unsupported Version" },
+    { 0xffffe874, "(-6028) Error Must Wait Checkpoint" },
+    { 0xffffe873, "(-6029) Attribute Maintenance in Progress" },
+    { 0xffffe872, "(-6030) Error Abort Transaction" },
     { 0,          NULL }
 };
 
@@ -6409,6 +6815,7 @@
         foffset += 4;
         proto_tree_add_item(ndps_tree, hf_ndps_other_error_2, tvb, foffset, 4, FALSE);
         foffset += 4;
+        foffset = ndps_string(tvb, hf_ndps_other_error_string, ndps_tree, foffset, NULL, 0);
         break;
     case 2:                 /* Access Error */
         proto_tree_add_item(ndps_tree, hf_problem_type, tvb, foffset, 4, FALSE);
@@ -7970,7 +8377,12 @@
         { &hf_ndps_error,
         { "NDPS Error",    "spx.ndps_error",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "NDPS Error", HFILL }}, 
+          "NDPS Error", HFILL }},
+
+        { &hf_ndps_other_error_string,
+        { "Extended Error String",    "ndps.ext_err_string",
+          FT_STRING,    BASE_NONE,   NULL,   0x0,
+          "Extended Error String", HFILL }},
         
         { &hf_spx_ndps_func_print,
         { "Print Program",    "spx.ndps_func_print",
@@ -8303,9 +8715,9 @@
           "Qualifier", HFILL }},
 
         { &hf_ndps_lib_error,
-        { "Lib Error",    "ndps.ndps_lib_error",
+        { "Library Error",    "ndps.ndps_lib_error",
           FT_UINT32,    BASE_HEX,   VALS(ndps_error_types),   0x0,
-          "Lib Error", HFILL }},
+          "Library Error", HFILL }},
 
         { &hf_ndps_other_error,
         { "Other Error",    "ndps.ndps_other_error",