Author: gd Date: 2007-06-27 09:36:00 +0000 (Wed, 27 Jun 2007) New Revision: 23624
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23624 Log: Merge dos error code from samba4 (returned from dfs_Enum against w2k3 as soon as a one DFS_VOLUME_FLAVOR_AD_BLOB dfsroot exists). Guenther Modified: branches/SAMBA_3_0/source/include/doserr.h branches/SAMBA_3_0/source/libsmb/doserr.c branches/SAMBA_3_0_26/source/include/doserr.h branches/SAMBA_3_0_26/source/libsmb/doserr.c Changeset: Modified: branches/SAMBA_3_0/source/include/doserr.h =================================================================== --- branches/SAMBA_3_0/source/include/doserr.h 2007-06-27 09:23:50 UTC (rev 23623) +++ branches/SAMBA_3_0/source/include/doserr.h 2007-06-27 09:36:00 UTC (rev 23624) @@ -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) Modified: branches/SAMBA_3_0/source/libsmb/doserr.c =================================================================== --- branches/SAMBA_3_0/source/libsmb/doserr.c 2007-06-27 09:23:50 UTC (rev 23623) +++ branches/SAMBA_3_0/source/libsmb/doserr.c 2007-06-27 09:36:00 UTC (rev 23624) @@ -70,6 +70,7 @@ { "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 }, Modified: branches/SAMBA_3_0_26/source/include/doserr.h =================================================================== --- branches/SAMBA_3_0_26/source/include/doserr.h 2007-06-27 09:23:50 UTC (rev 23623) +++ branches/SAMBA_3_0_26/source/include/doserr.h 2007-06-27 09:36:00 UTC (rev 23624) @@ -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) Modified: branches/SAMBA_3_0_26/source/libsmb/doserr.c =================================================================== --- branches/SAMBA_3_0_26/source/libsmb/doserr.c 2007-06-27 09:23:50 UTC (rev 23623) +++ branches/SAMBA_3_0_26/source/libsmb/doserr.c 2007-06-27 09:36:00 UTC (rev 23624) @@ -70,6 +70,7 @@ { "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 },