r23624: Merge dos error code from samba4 (returned from dfs_Enum against w2k3 as...

as a one DFS_VOLUME_FLAVOR_AD_BLOB dfsroot exists).

Guenther
(This used to be commit 837b0a14c430faa4e4cada03a1efe2823a7b2e2e)

diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index 5073cd005c186a3240f0183e1366ff197110e036..e9dab2adefad20c1dcdffdfb1ef05eb44b788844 100644 (file)
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -217,6 +217,7 @@
 #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_DEVICE_NOT_AVAILABLE W_ERROR(4319)
 #define WERR_STATUS_MORE_ENTRIES   W_ERROR(0x0105)
 
 #define WERR_PRINTER_DRIVER_ALREADY_INSTALLED W_ERROR(ERRdriveralreadyinstalled)

diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
index 022d9b6247386215c8b8a5e4c45bbf388d14001f..7e386e9606b131462d05d50f978484e2f46edc3d 100644 (file)
--- a/source3/libsmb/doserr.c
+++ b/source3/libsmb/doserr.c
@@ -70,6 +70,7 @@ 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_DEVICE_NOT_AVAILABLE", WERR_DEVICE_NOT_AVAILABLE },
        { "WERR_LOGON_FAILURE", WERR_LOGON_FAILURE },
        { "WERR_NO_SUCH_DOMAIN", WERR_NO_SUCH_DOMAIN },
        { "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR },