diff options
| author | Günther Deschner <gd@samba.org> | 2007-11-30 19:46:25 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@sernet.de> | 2007-11-30 22:25:01 +0100 |
| commit | 22cf7f5ffa7f37be3c85d226c3477508f88eccd5 (patch) | |
| tree | cadd6f4bd44aed747d17bbe3ed0c2dc827702a3f | |
| parent | a51e682a21b42cc518e9f3fdbcfa86a9a881ead0 (diff) | |
| download | samba-22cf7f5ffa7f37be3c85d226c3477508f88eccd5.tar.gz samba-22cf7f5ffa7f37be3c85d226c3477508f88eccd5.tar.bz2 samba-22cf7f5ffa7f37be3c85d226c3477508f88eccd5.zip | |
Merge join error codes from Samba 4.
Guenther
(This used to be commit 88a01bd810c36631272c5db727334bdc6f12f07d)
| -rw-r--r-- | source3/include/doserr.h | 5 | ||||
| -rw-r--r-- | source3/libsmb/doserr.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h index 6e29faf96f..a22eda2ab7 100644 --- a/source3/include/doserr.h +++ b/source3/include/doserr.h @@ -217,6 +217,11 @@ #define WERR_DEST_NOT_FOUND W_ERROR(2152) #define WERR_NOT_LOCAL_DOMAIN W_ERROR(2320) #define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(2453) + +#define WERR_SETUP_ALREADY_JOINED W_ERROR(2691) +#define WERR_SETUP_NOT_JOINED W_ERROR(2692) +#define WERR_SETUP_DOMAIN_CONTROLLER W_ERROR(2693) + #define WERR_DEVICE_NOT_AVAILABLE W_ERROR(4319) #define WERR_STATUS_MORE_ENTRIES W_ERROR(0x0105) diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c index 478b87d730..84cc898187 100644 --- a/source3/libsmb/doserr.c +++ b/source3/libsmb/doserr.c @@ -69,6 +69,9 @@ werror_code_struct dos_errs[] = { "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT }, { "WERR_MACHINE_LOCKED", WERR_MACHINE_LOCKED }, { "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND }, + { "WERR_SETUP_NOT_JOINED", WERR_SETUP_NOT_JOINED }, + { "WERR_SETUP_ALREADY_JOINED", WERR_SETUP_ALREADY_JOINED }, + { "WERR_SETUP_DOMAIN_CONTROLLER", WERR_SETUP_DOMAIN_CONTROLLER }, { "WERR_DEVICE_NOT_AVAILABLE", WERR_DEVICE_NOT_AVAILABLE }, { "WERR_LOGON_FAILURE", WERR_LOGON_FAILURE }, { "WERR_NO_SUCH_DOMAIN", WERR_NO_SUCH_DOMAIN }, |