[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-384-g35f4b88
Günther Deschner
gd at samba.org
Wed Sep 16 23:21:46 MDT 2009
The branch, master has been updated
via 35f4b88c7c6a16664efef95d441389e3d2bc8c4c (commit)
via 8bebce45d33babc22dea4bb10f661ea502d8bbdd (commit)
via 3f835eb9478b30bb91593c2a0073b72e696076f2 (commit)
via 91d3d3c6a23ffba755ac4b72d668fb247340fc24 (commit)
via fc1ac736d6c7b1e647890255d4217609f45dcb77 (commit)
via 1cfac63fa4335b45b9c722316a45b2b187de78a0 (commit)
from 277597de8548d6bcc65e7eff40b238415659eb17 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 35f4b88c7c6a16664efef95d441389e3d2bc8c4c
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 17 06:03:47 2009 +0300
w32err: use WERR_DC_NOT_FOUND name instead of WERR_DOMAIN_CONTROLLER_NOT_FOUND
Signed-off-by: Günther Deschner <gd at samba.org>
commit 8bebce45d33babc22dea4bb10f661ea502d8bbdd
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 17 05:59:08 2009 +0300
w32err: Set hex format values for all errors
Signed-off-by: Günther Deschner <gd at samba.org>
commit 3f835eb9478b30bb91593c2a0073b72e696076f2
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 17 05:53:40 2009 +0300
w32err: Re-define errors with numeric values
Signed-off-by: Günther Deschner <gd at samba.org>
commit 91d3d3c6a23ffba755ac4b72d668fb247340fc24
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 17 05:08:34 2009 +0300
w32err: Sorting error codes in ascending order
Signed-off-by: Günther Deschner <gd at samba.org>
commit fc1ac736d6c7b1e647890255d4217609f45dcb77
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 17 04:53:02 2009 +0300
w32err: NERR_ codes grouped together
Signed-off-by: Günther Deschner <gd at samba.org>
commit 1cfac63fa4335b45b9c722316a45b2b187de78a0
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 17 04:28:28 2009 +0300
w32err: WERR_CLASS_NOT_REGISTERED updated
Error code move to COM/OLE group.
Error value changed to as REGDB_E_CLASSNOTREG in Windows
Signed-off-by: Günther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/util/doserr.c | 2 +-
libcli/util/werror.h | 283 +++++++++++++++++++++---------------------
source3/libnet/libnet_join.c | 4 +-
3 files changed, 146 insertions(+), 143 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 6af1972..5e74138 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -179,7 +179,6 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_INVALID_USER_BUFFER", WERR_INVALID_USER_BUFFER },
{ "WERR_NO_TRUST_SAM_ACCOUNT", WERR_NO_TRUST_SAM_ACCOUNT },
{ "WERR_INVALID_PRINTER_COMMAND", WERR_INVALID_PRINTER_COMMAND },
- { "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
{ "WERR_NO_SHUTDOWN_IN_PROGRESS", WERR_NO_SHUTDOWN_IN_PROGRESS },
{ "WERR_SHUTDOWN_ALREADY_IN_PROGRESS", WERR_SHUTDOWN_ALREADY_IN_PROGRESS },
{ "WERR_SEC_E_ENCRYPT_FAILURE", WERR_SEC_E_ENCRYPT_FAILURE },
@@ -217,6 +216,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_UNKNOWN_PRINT_MONITOR", WERR_UNKNOWN_PRINT_MONITOR },
{ "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION },
{ "WERR_WRONG_PASSWORD", WERR_WRONG_PASSWORD },
+ { "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
{ NULL, W_ERROR(0) }
};
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index f82879c..d64746b 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -74,139 +74,130 @@ typedef uint32_t WERROR;
/* these are win32 error codes. There are only a few places where
these matter for Samba, primarily in the NT printing code */
-#define WERR_OK W_ERROR(0)
-#define WERR_BADFUNC W_ERROR(1)
-#define WERR_BADFILE W_ERROR(2)
-#define WERR_ACCESS_DENIED W_ERROR(5)
-#define WERR_BADFID W_ERROR(6)
-#define WERR_NOMEM W_ERROR(8)
-#define WERR_GENERAL_FAILURE W_ERROR(31)
-#define WERR_NOT_SUPPORTED W_ERROR(50)
-#define WERR_DUP_NAME W_ERROR(52)
-#define WERR_BAD_NETPATH W_ERROR(53)
-#define WERR_BAD_NET_RESP W_ERROR(58)
-#define WERR_UNEXP_NET_ERR W_ERROR(59)
-#define WERR_DEVICE_NOT_EXIST W_ERROR(55)
-#define WERR_PRINTQ_FULL W_ERROR(61)
-#define WERR_NO_SPOOL_SPACE W_ERROR(62)
-#define WERR_NO_SUCH_SHARE W_ERROR(67)
-#define WERR_FILE_EXISTS W_ERROR(80)
-#define WERR_BAD_PASSWORD W_ERROR(86)
-#define WERR_INVALID_PARAM W_ERROR(87)
-#define WERR_CALL_NOT_IMPLEMENTED W_ERROR(120)
-#define WERR_SEM_TIMEOUT W_ERROR(121)
-#define WERR_INSUFFICIENT_BUFFER W_ERROR(122)
-#define WERR_INVALID_NAME W_ERROR(123)
-#define WERR_UNKNOWN_LEVEL W_ERROR(124)
-#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
-#define WERR_ALREADY_EXISTS W_ERROR(183)
-#define WERR_NO_MORE_ITEMS W_ERROR(259)
-#define WERR_MORE_DATA W_ERROR(234)
-#define WERR_INVALID_OWNER W_ERROR(1307)
-#define WERR_IO_PENDING W_ERROR(997)
-#define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
-#define WERR_INVALID_FLAGS W_ERROR(1004)
-#define WERR_REG_CORRUPT W_ERROR(1015)
-#define WERR_REG_IO_FAILURE W_ERROR(1016)
-#define WERR_REG_FILE_INVALID W_ERROR(1017)
-#define WERR_NO_SUCH_SERVICE W_ERROR(1060)
-#define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052)
-#define WERR_SERVICE_ALREADY_RUNNING W_ERROR(1056)
-#define WERR_SERVICE_DISABLED W_ERROR(1058)
-#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(1072)
-#define WERR_SERVICE_EXISTS W_ERROR(1073)
-#define WERR_SERVICE_NEVER_STARTED W_ERROR(1077)
-#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(1078)
-#define WERR_DEVICE_NOT_CONNECTED W_ERROR(1167)
-#define WERR_NOT_FOUND W_ERROR(1168)
-#define WERR_INVALID_COMPUTERNAME W_ERROR(1210)
-#define WERR_INVALID_DOMAINNAME W_ERROR(1212)
-#define WERR_NOT_AUTHENTICATED W_ERROR(1244)
-#define WERR_UNKNOWN_REVISION W_ERROR(1305)
-#define WERR_MACHINE_LOCKED W_ERROR(1271)
-#define WERR_REVISION_MISMATCH W_ERROR(1306)
-#define WERR_INVALID_OWNER W_ERROR(1307)
-#define WERR_INVALID_PRIMARY_GROUP W_ERROR(1308)
-#define WERR_NO_LOGON_SERVERS W_ERROR(1311)
-#define WERR_NO_SUCH_LOGON_SESSION W_ERROR(1312)
-#define WERR_NO_SUCH_PRIVILEGE W_ERROR(1313)
-#define WERR_PRIVILEGE_NOT_HELD W_ERROR(1314)
-#define WERR_USER_ALREADY_EXISTS W_ERROR(1316)
-#define WERR_NO_SUCH_USER W_ERROR(1317)
-#define WERR_GROUP_EXISTS W_ERROR(1318)
-#define WERR_NO_SUCH_GROUP W_ERROR(1319)
-#define WERR_MEMBER_IN_GROUP W_ERROR(1320)
-#define WERR_USER_NOT_IN_GROUP W_ERROR(1321)
-#define WERR_WRONG_PASSWORD W_ERROR(1323)
-#define WERR_PASSWORD_RESTRICTION W_ERROR(1325)
-#define WERR_LOGON_FAILURE W_ERROR(1326)
-#define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
-#define WERR_NONE_MAPPED W_ERROR(1332)
-#define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
-#define WERR_INVALID_DOMAIN_STATE W_ERROR(1353)
-#define WERR_INVALID_DOMAIN_ROLE W_ERROR(1354)
-#define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
-#define WERR_NO_SYSTEM_RESOURCES W_ERROR(1450)
-#define WERR_SPECIAL_ACCOUNT W_ERROR(1371)
-#define WERR_NO_SUCH_ALIAS W_ERROR(1376)
-#define WERR_MEMBER_IN_ALIAS W_ERROR(1378)
-#define WERR_ALIAS_EXISTS W_ERROR(1379)
-#define WERR_TIME_SKEW W_ERROR(1398)
-#define WERR_EVENTLOG_FILE_CORRUPT W_ERROR(1500)
-#define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
-#define WERR_INVALID_USER_BUFFER W_ERROR(1784)
-#define WERR_NO_TRUST_SAM_ACCOUNT W_ERROR(1787)
-#define WERR_INVALID_FORM_NAME W_ERROR(1902)
-#define WERR_INVALID_FORM_SIZE W_ERROR(1903)
-#define WERR_PASSWORD_MUST_CHANGE W_ERROR(1907)
-#define WERR_ACCOUNT_LOCKED_OUT W_ERROR(1909)
-#define WERR_ALREADY_SHARED W_ERROR(2118)
-#define WERR_NOT_CONNECTED W_ERROR(2250)
-#define WERR_NAME_NOT_FOUND W_ERROR(2273)
-#define WERR_SESSION_NOT_FOUND W_ERROR(2312)
-#define WERR_FID_NOT_FOUND W_ERROR(2314)
-#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(2453)
-#define WERR_TIME_DIFF_AT_DC W_ERROR(2457)
+#define WERR_OK W_ERROR(0x00000000)
+#define WERR_BADFUNC W_ERROR(0x00000001)
+#define WERR_BADFILE W_ERROR(0x00000002)
+#define WERR_ACCESS_DENIED W_ERROR(0x00000005)
+#define WERR_BADFID W_ERROR(0x00000006)
+#define WERR_NOMEM W_ERROR(0x00000008)
+#define WERR_GENERAL_FAILURE W_ERROR(0x0000001F)
+#define WERR_NOT_SUPPORTED W_ERROR(0x00000032)
+#define WERR_DUP_NAME W_ERROR(0x00000034)
+#define WERR_BAD_NETPATH W_ERROR(0x00000035)
+#define WERR_BAD_NET_RESP W_ERROR(0x0000003A)
+#define WERR_UNEXP_NET_ERR W_ERROR(0x0000003B)
+#define WERR_DEVICE_NOT_EXIST W_ERROR(0x00000037)
+#define WERR_PRINTQ_FULL W_ERROR(0x0000003D)
+#define WERR_NO_SPOOL_SPACE W_ERROR(0x0000003E)
+#define WERR_NO_SUCH_SHARE W_ERROR(0x00000043)
+#define WERR_FILE_EXISTS W_ERROR(0x00000050)
+#define WERR_BAD_PASSWORD W_ERROR(0x00000056)
+#define WERR_INVALID_PARAM W_ERROR(0x00000057)
+#define WERR_CALL_NOT_IMPLEMENTED W_ERROR(0x00000078)
+#define WERR_SEM_TIMEOUT W_ERROR(0x00000079)
+#define WERR_INSUFFICIENT_BUFFER W_ERROR(0x0000007A)
+#define WERR_INVALID_NAME W_ERROR(0x0000007B)
+#define WERR_UNKNOWN_LEVEL W_ERROR(0x0000007C)
+#define WERR_OBJECT_PATH_INVALID W_ERROR(0x000000A1)
+#define WERR_ALREADY_EXISTS W_ERROR(0x000000B7)
+#define WERR_MORE_DATA W_ERROR(0x000000EA)
+#define WERR_NO_MORE_ITEMS W_ERROR(0x00000103)
+#define WERR_STATUS_MORE_ENTRIES W_ERROR(0x00000105)
+#define WERR_IO_PENDING W_ERROR(0x000003E5)
+#define WERR_CAN_NOT_COMPLETE W_ERROR(0x000003EB)
+#define WERR_INVALID_FLAGS W_ERROR(0x000003EC)
+#define WERR_REG_CORRUPT W_ERROR(0x000003F7)
+#define WERR_REG_IO_FAILURE W_ERROR(0x000003F8)
+#define WERR_REG_FILE_INVALID W_ERROR(0x000003F9)
+#define WERR_INVALID_SERVICE_CONTROL W_ERROR(0x0000041C)
+#define WERR_SERVICE_ALREADY_RUNNING W_ERROR(0x00000420)
+#define WERR_SERVICE_DISABLED W_ERROR(0x00000422)
+#define WERR_NO_SUCH_SERVICE W_ERROR(0x00000424)
+#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(0x00000430)
+#define WERR_SERVICE_EXISTS W_ERROR(0x00000431)
+#define WERR_SERVICE_NEVER_STARTED W_ERROR(0x00000435)
+#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(0x00000436)
+#define WERR_DEVICE_NOT_CONNECTED W_ERROR(0x0000048F)
+#define WERR_NOT_FOUND W_ERROR(0x00000490)
+#define WERR_INVALID_COMPUTERNAME W_ERROR(0x000004BA)
+#define WERR_INVALID_DOMAINNAME W_ERROR(0x000004BC)
+#define WERR_NOT_AUTHENTICATED W_ERROR(0x000004DC)
+#define WERR_MACHINE_LOCKED W_ERROR(0x000004F7)
+#define WERR_UNKNOWN_REVISION W_ERROR(0x00000519)
+#define WERR_INVALID_OWNER W_ERROR(0x0000051B)
+#define WERR_REVISION_MISMATCH W_ERROR(0x0000051A)
+#define WERR_INVALID_OWNER W_ERROR(0x0000051B)
+#define WERR_INVALID_PRIMARY_GROUP W_ERROR(0x0000051C)
+#define WERR_NO_LOGON_SERVERS W_ERROR(0x0000051F)
+#define WERR_NO_SUCH_LOGON_SESSION W_ERROR(0x00000520)
+#define WERR_NO_SUCH_PRIVILEGE W_ERROR(0x00000521)
+#define WERR_PRIVILEGE_NOT_HELD W_ERROR(0x00000522)
+#define WERR_USER_ALREADY_EXISTS W_ERROR(0x00000524)
+#define WERR_NO_SUCH_USER W_ERROR(0x00000525)
+#define WERR_GROUP_EXISTS W_ERROR(0x00000526)
+#define WERR_NO_SUCH_GROUP W_ERROR(0x00000527)
+#define WERR_MEMBER_IN_GROUP W_ERROR(0x00000528)
+#define WERR_USER_NOT_IN_GROUP W_ERROR(0x00000529)
+#define WERR_WRONG_PASSWORD W_ERROR(0x0000052B)
+#define WERR_PASSWORD_RESTRICTION W_ERROR(0x0000052D)
+#define WERR_LOGON_FAILURE W_ERROR(0x0000052E)
+#define WERR_NONE_MAPPED W_ERROR(0x00000534)
+#define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(0x0000053A)
+#define WERR_INVALID_DOMAIN_STATE W_ERROR(0x00000549)
+#define WERR_INVALID_DOMAIN_ROLE W_ERROR(0x0000054A)
+#define WERR_NO_SUCH_DOMAIN W_ERROR(0x0000054B)
+#define WERR_SPECIAL_ACCOUNT W_ERROR(0x0000055B)
+#define WERR_NO_SUCH_ALIAS W_ERROR(0x00000560)
+#define WERR_MEMBER_IN_ALIAS W_ERROR(0x00000562)
+#define WERR_ALIAS_EXISTS W_ERROR(0x00000563)
+#define WERR_TIME_SKEW W_ERROR(0x00000576)
+#define WERR_NO_SYSTEM_RESOURCES W_ERROR(0x000005AA)
+#define WERR_EVENTLOG_FILE_CORRUPT W_ERROR(0x000005DC)
+#define WERR_SERVER_UNAVAILABLE W_ERROR(0x000006BA)
+#define WERR_INVALID_USER_BUFFER W_ERROR(0x000006F8)
+#define WERR_NO_TRUST_SAM_ACCOUNT W_ERROR(0x000006FB)
+#define WERR_INVALID_FORM_NAME W_ERROR(0x0000076E)
+#define WERR_INVALID_FORM_SIZE W_ERROR(0x0000076F)
+#define WERR_PASSWORD_MUST_CHANGE W_ERROR(0x00000773)
+#define WERR_ACCOUNT_LOCKED_OUT W_ERROR(0x00000775)
-#define WERR_DEVICE_NOT_AVAILABLE W_ERROR(4319)
-#define WERR_STATUS_MORE_ENTRIES W_ERROR(0x0105)
+#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(0x00000995) /* Error code is wrong, should be 0x00000774 (1908)*/
-#define WERR_PRINTER_DRIVER_ALREADY_INSTALLED W_ERROR(ERRdriveralreadyinstalled)
-#define WERR_UNKNOWN_PORT W_ERROR(ERRunknownprinterport)
-#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(ERRunknownprinterdriver)
-#define WERR_UNKNOWN_PRINTPROCESSOR W_ERROR(ERRunknownprintprocessor)
-#define WERR_INVALID_SEPARATOR_FILE W_ERROR(ERRinvalidseparatorfile)
-#define WERR_INVALID_PRIORITY W_ERROR(ERRinvalidjobpriority)
-#define WERR_INVALID_PRINTER_NAME W_ERROR(ERRinvalidprintername)
-#define WERR_PRINTER_ALREADY_EXISTS W_ERROR(ERRprinteralreadyexists)
-#define WERR_INVALID_PRINTER_COMMAND W_ERROR(ERRinvalidprintercommand)
-#define WERR_INVALID_DATATYPE W_ERROR(ERRinvaliddatatype)
-#define WERR_INVALID_ENVIRONMENT W_ERROR(ERRinvalidenvironment)
+#define WERR_DEVICE_NOT_AVAILABLE W_ERROR(0x000010DF)
-#define WERR_UNKNOWN_PRINT_MONITOR W_ERROR(ERRunknownprintmonitor)
-#define WERR_PRINTER_DRIVER_IN_USE W_ERROR(ERRprinterdriverinuse)
-#define WERR_SPOOL_FILE_NOT_FOUND W_ERROR(ERRspoolfilenotfound)
-#define WERR_SPL_NO_STARTDOC W_ERROR(ERRnostartdoc)
-#define WERR_SPL_NO_ADDJOB W_ERROR(ERRnoaddjob)
-#define WERR_PRINT_PROCESSOR_ALREADY_INSTALLED W_ERROR(ERRprintprocessoralreadyinstalled)
-#define WERR_PRINT_MONITOR_ALREADY_INSTALLED W_ERROR(ERRprintmonitoralreadyinstalled)
-#define WERR_INVALID_PRINT_MONITOR W_ERROR(ERRinvalidprintmonitor)
-#define WERR_PRINT_MONITOR_IN_USE W_ERROR(ERRprintmonitorinuse)
-#define WERR_PRINTER_HAS_JOBS_QUEUED W_ERROR(ERRprinterhasjobsqueued)
+#define WERR_PRINTER_DRIVER_ALREADY_INSTALLED W_ERROR(0x00000703)
+#define WERR_UNKNOWN_PORT W_ERROR(0x00000704)
+#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(0x00000705)
+#define WERR_UNKNOWN_PRINTPROCESSOR W_ERROR(0x00000706)
+#define WERR_INVALID_SEPARATOR_FILE W_ERROR(0x00000707)
+#define WERR_INVALID_PRIORITY W_ERROR(0x00000708)
+#define WERR_INVALID_PRINTER_NAME W_ERROR(0x00000709)
+#define WERR_PRINTER_ALREADY_EXISTS W_ERROR(0x0000070A)
+#define WERR_INVALID_PRINTER_COMMAND W_ERROR(0x0000070B)
+#define WERR_INVALID_DATATYPE W_ERROR(0x0000070C)
+#define WERR_INVALID_ENVIRONMENT W_ERROR(0x0000070D)
+
+#define WERR_UNKNOWN_PRINT_MONITOR W_ERROR(0x00000BB8)
+#define WERR_PRINTER_DRIVER_IN_USE W_ERROR(0x00000BB9)
+#define WERR_SPOOL_FILE_NOT_FOUND W_ERROR(0x00000BBA)
+#define WERR_SPL_NO_STARTDOC W_ERROR(0x00000BBB)
+#define WERR_SPL_NO_ADDJOB W_ERROR(0x00000BBC)
+#define WERR_PRINT_PROCESSOR_ALREADY_INSTALLED W_ERROR(0x00000BBD)
+#define WERR_PRINT_MONITOR_ALREADY_INSTALLED W_ERROR(0x00000BBE)
+#define WERR_INVALID_PRINT_MONITOR W_ERROR(0x00000BBF)
+#define WERR_PRINT_MONITOR_IN_USE W_ERROR(0x00000BC0)
+#define WERR_PRINTER_HAS_JOBS_QUEUED W_ERROR(0x00000BC1)
+
+#define WERR_NO_SHUTDOWN_IN_PROGRESS W_ERROR(0x0000045c)
+#define WERR_SHUTDOWN_ALREADY_IN_PROGRESS W_ERROR(0x0000045b)
-#define WERR_CLASS_NOT_REGISTERED W_ERROR(0x40154)
-#define WERR_NO_SHUTDOWN_IN_PROGRESS W_ERROR(0x45c)
-#define WERR_SHUTDOWN_ALREADY_IN_PROGRESS W_ERROR(0x45b)
/* Configuration Manager Errors */
/* Basically Win32 errors meanings are specific to the \ntsvcs pipe */
-
#define WERR_CM_INVALID_POINTER W_ERROR(3)
#define WERR_CM_BUFFER_SMALL W_ERROR(26)
#define WERR_CM_NO_MORE_HW_PROFILES W_ERROR(35)
#define WERR_CM_NO_SUCH_VALUE W_ERROR(37)
-#define WERR_DEVICE_NOT_SHARED W_ERROR(NERR_BASE+211)
-
/* DFS errors */
#ifndef NERR_BASE
@@ -217,24 +208,31 @@ typedef uint32_t WERROR;
#define MAX_NERR (NERR_BASE+899)
#endif
-#define WERR_BUF_TOO_SMALL W_ERROR(NERR_BASE+23)
-#define WERR_JOB_NOT_FOUND W_ERROR(NERR_BASE+51)
-#define WERR_DEST_NOT_FOUND W_ERROR(NERR_BASE+52)
-#define WERR_GROUP_NOT_FOUND W_ERROR(NERR_BASE+120)
-#define WERR_USER_NOT_FOUND W_ERROR(NERR_BASE+121)
-#define WERR_USER_EXISTS W_ERROR(NERR_BASE+124)
-#define WERR_NET_NAME_NOT_FOUND W_ERROR(NERR_BASE+210)
-#define WERR_NOT_LOCAL_DOMAIN W_ERROR(NERR_BASE+220)
-#define WERR_DC_NOT_FOUND W_ERROR(NERR_BASE+353)
-#define WERR_DFS_NO_SUCH_VOL W_ERROR(NERR_BASE+562)
-#define WERR_DFS_NO_SUCH_SHARE W_ERROR(NERR_BASE+565)
-#define WERR_DFS_NO_SUCH_SERVER W_ERROR(NERR_BASE+573)
-#define WERR_DFS_INTERNAL_ERROR W_ERROR(NERR_BASE+590)
-#define WERR_DFS_CANT_CREATE_JUNCT W_ERROR(NERR_BASE+569)
-#define WERR_SETUP_ALREADY_JOINED W_ERROR(NERR_BASE+591)
-#define WERR_SETUP_NOT_JOINED W_ERROR(NERR_BASE+592)
-#define WERR_SETUP_DOMAIN_CONTROLLER W_ERROR(NERR_BASE+593)
-#define WERR_DEFAULT_JOIN_REQUIRED W_ERROR(NERR_BASE+594)
+#define WERR_BUF_TOO_SMALL W_ERROR(0x0000084B)
+#define WERR_ALREADY_SHARED W_ERROR(0x00000846)
+#define WERR_JOB_NOT_FOUND W_ERROR(0x00000867)
+#define WERR_DEST_NOT_FOUND W_ERROR(0x00000868)
+#define WERR_GROUP_NOT_FOUND W_ERROR(0x000008AC)
+#define WERR_USER_NOT_FOUND W_ERROR(0x000008AD)
+#define WERR_USER_EXISTS W_ERROR(0x000008B0)
+#define WERR_NOT_CONNECTED W_ERROR(0x000008CA)
+#define WERR_NAME_NOT_FOUND W_ERROR(0x000008E1)
+#define WERR_NET_NAME_NOT_FOUND W_ERROR(0x00000906)
+#define WERR_SESSION_NOT_FOUND W_ERROR(0x00000908)
+#define WERR_DEVICE_NOT_SHARED W_ERROR(0x00000907)
+#define WERR_FID_NOT_FOUND W_ERROR(0x0000090A)
+#define WERR_NOT_LOCAL_DOMAIN W_ERROR(0x00000910)
+#define WERR_DC_NOT_FOUND W_ERROR(0x00000995)
+#define WERR_TIME_DIFF_AT_DC W_ERROR(0x00000999)
+#define WERR_DFS_NO_SUCH_VOL W_ERROR(0x00000A66)
+#define WERR_DFS_NO_SUCH_SHARE W_ERROR(0x00000A69)
+#define WERR_DFS_NO_SUCH_SERVER W_ERROR(0x00000A71)
+#define WERR_DFS_INTERNAL_ERROR W_ERROR(0x00000A82)
+#define WERR_DFS_CANT_CREATE_JUNCT W_ERROR(0x00000A6D)
+#define WERR_SETUP_ALREADY_JOINED W_ERROR(0x00000A83)
+#define WERR_SETUP_NOT_JOINED W_ERROR(0x00000A84)
+#define WERR_SETUP_DOMAIN_CONTROLLER W_ERROR(0x00000A85)
+#define WERR_DEFAULT_JOIN_REQUIRED W_ERROR(0x00000A86)
/* DS errors */
#define WERR_DS_NO_ATTRIBUTE_OR_VALUE W_ERROR(0x0000200A)
@@ -298,6 +296,7 @@ typedef uint32_t WERROR;
#define WERR_FRS_SYSVOL_IS_BUSY W_ERROR(FRS_ERR_BASE+15)
#define WERR_FRS_INVALID_SERVICE_PARAMETER W_ERROR(FRS_ERR_BASE+17)
+/* RPC/COM/OLE HRESULT error codes */
/* RPC errors */
#define WERR_RPC_E_INVALID_HEADER W_ERROR(0x80010111)
#define WERR_RPC_E_REMOTE_DISABLED W_ERROR(0x8001011c)
@@ -307,6 +306,10 @@ typedef uint32_t WERROR;
#define WERR_SEC_E_DECRYPT_FAILURE W_ERROR(0x80090330)
#define WERR_SEC_E_ALGORITHM_MISMATCH W_ERROR(0x80090331)
+/* COM REGDB error codes */
+#define WERR_CLASS_NOT_REGISTERED W_ERROR(0x80040154) /* REGDB_E_CLASSNOTREG */
+
+/* Generic error code aliases */
#define WERR_FOOBAR WERR_GENERAL_FAILURE
/*****************************************************************************
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 5315fcc..cd47686 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1828,7 +1828,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
"failed to find DC for domain %s",
r->in.domain_name,
get_friendly_nt_error_msg(status));
- return WERR_DOMAIN_CONTROLLER_NOT_FOUND;
+ return WERR_DC_NOT_FOUND;
}
dc = strip_hostname(info->dc_unc);
@@ -2019,7 +2019,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx,
"failed to find DC for domain %s",
r->in.domain_name,
get_friendly_nt_error_msg(status));
- return WERR_DOMAIN_CONTROLLER_NOT_FOUND;
+ return WERR_DC_NOT_FOUND;
}
dc = strip_hostname(info->dc_unc);
--
Samba Shared Repository
More information about the samba-cvs
mailing list