* errno.cc (errmap): Handle Windows error codes ERROR_CANCELLED,
ERROR_CONNECTION_REFUSED, ERROR_DEV_NOT_EXIST, ERROR_DS_GENERIC_ERROR, ERROR_NOT_ENOUGH_QUOTA, ERROR_SERVICE_REQUEST_TIMEOUT, ERROR_TIMEOUT, ERROR_UNEXP_NET_ERR. * ldap.cc (cyg_ldap::map_ldaperr_to_errno): Drop explicit LDAP_TIMEOUT handling.
This commit is contained in:
parent
37b1464588
commit
9b9fb0042f
|
@ -1,3 +1,12 @@
|
||||||
|
2014-06-25 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* errno.cc (errmap): Handle Windows error codes ERROR_CANCELLED,
|
||||||
|
ERROR_CONNECTION_REFUSED, ERROR_DEV_NOT_EXIST, ERROR_DS_GENERIC_ERROR,
|
||||||
|
ERROR_NOT_ENOUGH_QUOTA, ERROR_SERVICE_REQUEST_TIMEOUT, ERROR_TIMEOUT,
|
||||||
|
ERROR_UNEXP_NET_ERR.
|
||||||
|
* ldap.cc (cyg_ldap::map_ldaperr_to_errno): Drop explicit LDAP_TIMEOUT
|
||||||
|
handling.
|
||||||
|
|
||||||
2014-06-25 Corinna Vinschen <corinna@vinschen.de>
|
2014-06-25 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* ldap.cc (cyg_ldap::map_ldaperr_to_errno): Explicitely map LDAP_TIMEOUT
|
* ldap.cc (cyg_ldap::map_ldaperr_to_errno): Explicitely map LDAP_TIMEOUT
|
||||||
|
|
|
@ -59,17 +59,21 @@ static const struct
|
||||||
X (BUSY, EBUSY),
|
X (BUSY, EBUSY),
|
||||||
X (BUS_RESET, EIO),
|
X (BUS_RESET, EIO),
|
||||||
X (CALL_NOT_IMPLEMENTED, ENOSYS),
|
X (CALL_NOT_IMPLEMENTED, ENOSYS),
|
||||||
|
X (CANCELLED, EINTR),
|
||||||
X (CANNOT_MAKE, EPERM),
|
X (CANNOT_MAKE, EPERM),
|
||||||
X (CHILD_NOT_COMPLETE, EBUSY),
|
X (CHILD_NOT_COMPLETE, EBUSY),
|
||||||
X (COMMITMENT_LIMIT, EAGAIN),
|
X (COMMITMENT_LIMIT, EAGAIN),
|
||||||
|
X (CONNECTION_REFUSED, ECONNREFUSED),
|
||||||
X (CRC, EIO),
|
X (CRC, EIO),
|
||||||
X (DEVICE_DOOR_OPEN, EIO),
|
X (DEVICE_DOOR_OPEN, EIO),
|
||||||
X (DEVICE_IN_USE, EAGAIN),
|
X (DEVICE_IN_USE, EAGAIN),
|
||||||
X (DEVICE_REQUIRES_CLEANING, EIO),
|
X (DEVICE_REQUIRES_CLEANING, EIO),
|
||||||
|
X (DEV_NOT_EXIST, ENOENT),
|
||||||
X (DIRECTORY, ENOTDIR),
|
X (DIRECTORY, ENOTDIR),
|
||||||
X (DIR_NOT_EMPTY, ENOTEMPTY),
|
X (DIR_NOT_EMPTY, ENOTEMPTY),
|
||||||
X (DISK_CORRUPT, EIO),
|
X (DISK_CORRUPT, EIO),
|
||||||
X (DISK_FULL, ENOSPC),
|
X (DISK_FULL, ENOSPC),
|
||||||
|
X (DS_GENERIC_ERROR, EIO),
|
||||||
X (DUP_NAME, ENOTUNIQ),
|
X (DUP_NAME, ENOTUNIQ),
|
||||||
X (EAS_DIDNT_FIT, ENOSPC),
|
X (EAS_DIDNT_FIT, ENOSPC),
|
||||||
X (EAS_NOT_SUPPORTED, ENOTSUP),
|
X (EAS_NOT_SUPPORTED, ENOTSUP),
|
||||||
|
@ -115,6 +119,7 @@ static const struct
|
||||||
X (NONPAGED_SYSTEM_RESOURCES, EAGAIN),
|
X (NONPAGED_SYSTEM_RESOURCES, EAGAIN),
|
||||||
X (NOT_CONNECTED, ENOLINK),
|
X (NOT_CONNECTED, ENOLINK),
|
||||||
X (NOT_ENOUGH_MEMORY, ENOMEM),
|
X (NOT_ENOUGH_MEMORY, ENOMEM),
|
||||||
|
X (NOT_ENOUGH_QUOTA, EIO),
|
||||||
X (NOT_OWNER, EPERM),
|
X (NOT_OWNER, EPERM),
|
||||||
X (NOT_READY, ENOMEDIUM),
|
X (NOT_READY, ENOMEDIUM),
|
||||||
X (NOT_SAME_DEVICE, EXDEV),
|
X (NOT_SAME_DEVICE, EXDEV),
|
||||||
|
@ -149,12 +154,15 @@ static const struct
|
||||||
X (SETMARK_DETECTED, EIO),
|
X (SETMARK_DETECTED, EIO),
|
||||||
X (SHARING_BUFFER_EXCEEDED, ENOLCK),
|
X (SHARING_BUFFER_EXCEEDED, ENOLCK),
|
||||||
X (SHARING_VIOLATION, EBUSY),
|
X (SHARING_VIOLATION, EBUSY),
|
||||||
|
X (SERVICE_REQUEST_TIMEOUT, EBUSY),
|
||||||
X (SIGNAL_PENDING, EBUSY),
|
X (SIGNAL_PENDING, EBUSY),
|
||||||
X (SIGNAL_REFUSED, EIO),
|
X (SIGNAL_REFUSED, EIO),
|
||||||
X (SXS_CANT_GEN_ACTCTX, ELIBBAD),
|
X (SXS_CANT_GEN_ACTCTX, ELIBBAD),
|
||||||
X (THREAD_1_INACTIVE, EINVAL),
|
X (THREAD_1_INACTIVE, EINVAL),
|
||||||
|
X (TIMEOUT, EBUSY),
|
||||||
X (TOO_MANY_LINKS, EMLINK),
|
X (TOO_MANY_LINKS, EMLINK),
|
||||||
X (TOO_MANY_OPEN_FILES, EMFILE),
|
X (TOO_MANY_OPEN_FILES, EMFILE),
|
||||||
|
X (UNEXP_NET_ERR, EIO),
|
||||||
X (WAIT_NO_CHILDREN, ECHILD),
|
X (WAIT_NO_CHILDREN, ECHILD),
|
||||||
X (WORKING_SET_QUOTA, EAGAIN),
|
X (WORKING_SET_QUOTA, EAGAIN),
|
||||||
X (WRITE_PROTECT, EROFS),
|
X (WRITE_PROTECT, EROFS),
|
||||||
|
|
|
@ -89,8 +89,6 @@ cyg_ldap::map_ldaperr_to_errno (ULONG lerr)
|
||||||
is SO wrong, especially considering that LDAP_MORE_RESULTS_TO_RETURN
|
is SO wrong, especially considering that LDAP_MORE_RESULTS_TO_RETURN
|
||||||
is mapped to ERROR_MORE_DATA as well :-P */
|
is mapped to ERROR_MORE_DATA as well :-P */
|
||||||
return ENMFILE;
|
return ENMFILE;
|
||||||
case LDAP_TIMEOUT:
|
|
||||||
return EIO;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue