Merge join error codes from Samba 4.

Guenther
(This used to be commit 88a01bd810c36631272c5db727334bdc6f12f07d)

diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index 6e29faf96fbe88c241b64ac65ed36bf92d98b9cc..a22eda2ab7e37e74f08896b7c451456b6dbb67fa 100644 (file)
--- 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 478b87d73028f4001be575c6a989f6ac024af1a7..84cc8981879ccc0e3a849acb50082b42926381d6 100644 (file)
--- 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 },