Date: Sat, 27 Dec 2008 23:09:36 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 155351 for review Message-ID: <200812272309.mBRN9aDK028991@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=155351 Change 155351 by rwatson@rwatson_cinnamon on 2008/12/27 23:09:03 Prefix all BSM errno number values with BSM_ERRNO_ instead of BSM_ in order to avoid future namespace collisions. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#23 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#13 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#23 (text+ko) ==== @@ -3,6 +3,7 @@ OpenBSM 1.1 alpha 5 - Stub libauditd(3) man page added. +- All BSM error number constants with BSM_ERRNO_. OpenBSM 1.1 alpha 4 @@ -397,4 +398,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#22 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#23 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#13 $ */ #include <sys/types.h> @@ -71,491 +71,491 @@ * string using strerror(3). */ static const struct bsm_errors bsm_errors[] = { - { BSM_ESUCCESS, 0, "Success" }, - { BSM_EPERM, EPERM, "Operation not permitted" }, - { BSM_ENOENT, ENOENT, "No such file or directory" }, - { BSM_ESRCH, ESRCH, "No such process" }, - { BSM_EINTR, EINTR, "Interrupted system call" }, - { BSM_EIO, EIO, "Input/output error" }, - { BSM_ENXIO, ENXIO, "Device not configured" }, - { BSM_E2BIG, E2BIG, "Argument list too long" }, - { BSM_ENOEXEC, ENOEXEC, "Exec format error" }, - { BSM_EBADF, EBADF, "BAd file descriptor" }, - { BSM_ECHILD, ECHILD, "No child processes" }, - { BSM_EAGAIN, EAGAIN, "Resource temporarily unavailable" }, - { BSM_ENOMEM, ENOMEM, "Cannot allocate memory" }, - { BSM_EACCES, EACCES, "Permission denied" }, - { BSM_EFAULT, EFAULT, "Bad address" }, - { BSM_ENOTBLK, ENOTBLK, "Block device required" }, - { BSM_EBUSY, EBUSY, "Device busy" }, - { BSM_EEXIST, EEXIST, "File exists" }, - { BSM_EXDEV, EXDEV, "Cross-device link" }, - { BSM_ENODEV, ENODEV, "Operation not supported by device" }, - { BSM_ENOTDIR, ENOTDIR, "Not a directory" }, - { BSM_EISDIR, EISDIR, "Is a directory" }, - { BSM_EINVAL, EINVAL, "Invalid argument" }, - { BSM_ENFILE, ENFILE, "Too many open files in system" }, - { BSM_EMFILE, EMFILE, "Too many open files" }, - { BSM_ENOTTY, ENOTTY, "Inappropriate ioctl for device" }, - { BSM_ETXTBSY, ETXTBSY, "Text file busy" }, - { BSM_EFBIG, EFBIG, "File too large" }, - { BSM_ENOSPC, ENOSPC, "No space left on device" }, - { BSM_ESPIPE, ESPIPE, "Illegal seek" }, - { BSM_EROFS, EROFS, "Read-only file system" }, - { BSM_EMLINK, EMLINK, "Too many links" }, - { BSM_EPIPE, EPIPE, "Broken pipe" }, - { BSM_EDOM, EDOM, "Numerical argument out of domain" }, - { BSM_ERANGE, ERANGE, "Result too large" }, - { BSM_ENOMSG, ENOMSG, "No message of desired type" }, - { BSM_EIDRM, EIDRM, "Identifier removed" }, - { BSM_ECHRNG, + { BSM_ERRNO_ESUCCESS, 0, "Success" }, + { BSM_ERRNO_EPERM, EPERM, "Operation not permitted" }, + { BSM_ERRNO_ENOENT, ENOENT, "No such file or directory" }, + { BSM_ERRNO_ESRCH, ESRCH, "No such process" }, + { BSM_ERRNO_EINTR, EINTR, "Interrupted system call" }, + { BSM_ERRNO_EIO, EIO, "Input/output error" }, + { BSM_ERRNO_ENXIO, ENXIO, "Device not configured" }, + { BSM_ERRNO_E2BIG, E2BIG, "Argument list too long" }, + { BSM_ERRNO_ENOEXEC, ENOEXEC, "Exec format error" }, + { BSM_ERRNO_EBADF, EBADF, "BAd file descriptor" }, + { BSM_ERRNO_ECHILD, ECHILD, "No child processes" }, + { BSM_ERRNO_EAGAIN, EAGAIN, "Resource temporarily unavailable" }, + { BSM_ERRNO_ENOMEM, ENOMEM, "Cannot allocate memory" }, + { BSM_ERRNO_EACCES, EACCES, "Permission denied" }, + { BSM_ERRNO_EFAULT, EFAULT, "Bad address" }, + { BSM_ERRNO_ENOTBLK, ENOTBLK, "Block device required" }, + { BSM_ERRNO_EBUSY, EBUSY, "Device busy" }, + { BSM_ERRNO_EEXIST, EEXIST, "File exists" }, + { BSM_ERRNO_EXDEV, EXDEV, "Cross-device link" }, + { BSM_ERRNO_ENODEV, ENODEV, "Operation not supported by device" }, + { BSM_ERRNO_ENOTDIR, ENOTDIR, "Not a directory" }, + { BSM_ERRNO_EISDIR, EISDIR, "Is a directory" }, + { BSM_ERRNO_EINVAL, EINVAL, "Invalid argument" }, + { BSM_ERRNO_ENFILE, ENFILE, "Too many open files in system" }, + { BSM_ERRNO_EMFILE, EMFILE, "Too many open files" }, + { BSM_ERRNO_ENOTTY, ENOTTY, "Inappropriate ioctl for device" }, + { BSM_ERRNO_ETXTBSY, ETXTBSY, "Text file busy" }, + { BSM_ERRNO_EFBIG, EFBIG, "File too large" }, + { BSM_ERRNO_ENOSPC, ENOSPC, "No space left on device" }, + { BSM_ERRNO_ESPIPE, ESPIPE, "Illegal seek" }, + { BSM_ERRNO_EROFS, EROFS, "Read-only file system" }, + { BSM_ERRNO_EMLINK, EMLINK, "Too many links" }, + { BSM_ERRNO_EPIPE, EPIPE, "Broken pipe" }, + { BSM_ERRNO_EDOM, EDOM, "Numerical argument out of domain" }, + { BSM_ERRNO_ERANGE, ERANGE, "Result too large" }, + { BSM_ERRNO_ENOMSG, ENOMSG, "No message of desired type" }, + { BSM_ERRNO_EIDRM, EIDRM, "Identifier removed" }, + { BSM_ERRNO_ECHRNG, #ifdef ECHRNG ECHRNG, #else ERRNO_NO_LOCAL_MAPPING, #endif "Channel number out of range" }, - { BSM_EL2NSYNC, + { BSM_ERRNO_EL2NSYNC, #ifdef EL2NSYNC EL2NSYNC, #else ERRNO_NO_LOCAL_MAPPING, #endif "Level 2 not synchronized" }, - { BSM_EL3HLT, + { BSM_ERRNO_EL3HLT, #ifdef EL3HLT EL3HLT, #else ERRNO_NO_LOCAL_MAPPING, #endif "Level 3 halted" }, - { BSM_EL3RST, + { BSM_ERRNO_EL3RST, #ifdef EL3RST EL3RST, #else ERRNO_NO_LOCAL_MAPPING, #endif "Level 3 reset" }, - { BSM_ELNRNG, + { BSM_ERRNO_ELNRNG, #ifdef ELNRNG ELNRNG, #else ERRNO_NO_LOCAL_MAPPING, #endif "Link number out of range" }, - { BSM_EUNATCH, + { BSM_ERRNO_EUNATCH, #ifdef EUNATCH EUNATCH, #else ERRNO_NO_LOCAL_MAPPING, #endif "Protocol driver not attached" }, - { BSM_ENOCSI, + { BSM_ERRNO_ENOCSI, #ifdef ENOCSI ENOCSI, #else ERRNO_NO_LOCAL_MAPPING, #endif "No CSI structure available" }, - { BSM_EL2HLT, + { BSM_ERRNO_EL2HLT, #ifdef EL2HLT EL2HLT, #else ERRNO_NO_LOCAL_MAPPING, #endif "Level 2 halted" }, - { BSM_EDEADLK, EDEADLK, "Resource deadlock avoided" }, - { BSM_ENOLCK, ENOLCK, "No locks available" }, - { BSM_ECANCELED, ECANCELED, "Operation canceled" }, - { BSM_ENOTSUP, ENOTSUP, "Operation not supported" }, - { BSM_EDQUOT, EDQUOT, "Disc quota exceeded" }, - { BSM_EBADE, + { BSM_ERRNO_EDEADLK, EDEADLK, "Resource deadlock avoided" }, + { BSM_ERRNO_ENOLCK, ENOLCK, "No locks available" }, + { BSM_ERRNO_ECANCELED, ECANCELED, "Operation canceled" }, + { BSM_ERRNO_ENOTSUP, ENOTSUP, "Operation not supported" }, + { BSM_ERRNO_EDQUOT, EDQUOT, "Disc quota exceeded" }, + { BSM_ERRNO_EBADE, #ifdef EBADE EBADE, #else ERRNO_NO_LOCAL_MAPPING, #endif "Invalid exchange" }, - { BSM_EBADR, + { BSM_ERRNO_EBADR, #ifdef EBADR EBADR, #else ERRNO_NO_LOCAL_MAPPING, #endif "Invalid request descriptor" }, - { BSM_EXFULL, + { BSM_ERRNO_EXFULL, #ifdef EXFULL EXFULL, #else ERRNO_NO_LOCAL_MAPPING, #endif "Exchange full" }, - { BSM_ENOANO, + { BSM_ERRNO_ENOANO, #ifdef ENOANO ENOANO, #else ERRNO_NO_LOCAL_MAPPING, #endif "No anode" }, - { BSM_EBADRQC, + { BSM_ERRNO_EBADRQC, #ifdef EBADRQC EBADRQC, #else ERRNO_NO_LOCAL_MAPPING, #endif "Invalid request descriptor" }, - { BSM_EBADSLT, + { BSM_ERRNO_EBADSLT, #ifdef EBADSLT EBADSLT, #else ERRNO_NO_LOCAL_MAPPING, #endif "Invalid slot" }, - { BSM_EDEADLOCK, + { BSM_ERRNO_EDEADLOCK, #ifdef EDEADLOCK EDEADLOCK, #else ERRNO_NO_LOCAL_MAPPING, #endif "Resource deadlock avoided" }, - { BSM_EBFONT, + { BSM_ERRNO_EBFONT, #ifdef EBFONT EBFONT, #else ERRNO_NO_LOCAL_MAPPING, #endif "Bad font file format" }, - { BSM_EOWNERDEAD, + { BSM_ERRNO_EOWNERDEAD, #ifdef EOWNERDEAD EOWNERDEAD, #else ERRNO_NO_LOCAL_MAPPING, #endif "Process died with the lock" }, - { BSM_ENOTRECOVERABLE, + { BSM_ERRNO_ENOTRECOVERABLE, #ifdef ENOTRECOVERABLE ENOTRECOVERABLE, #else ERRNO_NO_LOCAL_MAPPING, #endif "Lock is not recoverable" }, - { BSM_ENOSTR, + { BSM_ERRNO_ENOSTR, #ifdef ENOSTR ENOSTR, #else ERRNO_NO_LOCAL_MAPPING, #endif "Device not a stream" }, - { BSM_ENONET, + { BSM_ERRNO_ENONET, #ifdef ENONET ENONET, #else ERRNO_NO_LOCAL_MAPPING, #endif "Machine is not on the network" }, - { BSM_ENOPKG, + { BSM_ERRNO_ENOPKG, #ifdef ENOPKG ENOPKG, #else ERRNO_NO_LOCAL_MAPPING, #endif "Package not installed" }, - { BSM_EREMOTE, EREMOTE, "Too many levels of remote in path" }, - { BSM_ENOLINK, + { BSM_ERRNO_EREMOTE, EREMOTE, "Too many levels of remote in path" }, + { BSM_ERRNO_ENOLINK, #ifdef ENOLINK ENOLINK, #else ERRNO_NO_LOCAL_MAPPING, #endif "Link has been severed" }, - { BSM_EADV, + { BSM_ERRNO_EADV, #ifdef EADV EADV, #else ERRNO_NO_LOCAL_MAPPING, #endif "Advertise error" }, - { BSM_ESRMNT, + { BSM_ERRNO_ESRMNT, #ifdef ESRMNT ESRMNT, #else ERRNO_NO_LOCAL_MAPPING, #endif "srmount error" }, - { BSM_ECOMM, + { BSM_ERRNO_ECOMM, #ifdef ECOMM ECOMM, #else ERRNO_NO_LOCAL_MAPPING, #endif "Communication error on send" }, - { BSM_EPROTO, + { BSM_ERRNO_EPROTO, #ifdef EPROTO EPROTO, #else ERRNO_NO_LOCAL_MAPPING, #endif "Protocol error" }, - { BSM_ELOCKUNMAPPED, + { BSM_ERRNO_ELOCKUNMAPPED, #ifdef ELOCKUNMAPPED ELOCKUNMAPPED, #else ERRNO_NO_LOCAL_MAPPING, #endif "Locked lock was unmapped" }, - { BSM_ENOTACTIVE, + { BSM_ERRNO_ENOTACTIVE, #ifdef ENOTACTIVE ENOTACTIVE, #else ERRNO_NO_LOCAL_MAPPING, #endif "Facility is not active" }, - { BSM_EMULTIHOP, + { BSM_ERRNO_EMULTIHOP, #ifdef EMULTIHOP EMULTIHOP, #else ERRNO_NO_LOCAL_MAPPING, #endif "Multihop attempted" }, - { BSM_EBADMSG, + { BSM_ERRNO_EBADMSG, #ifdef EBADMSG EBADMSG, #else ERRNO_NO_LOCAL_MAPPING, #endif "Bad message" }, - { BSM_ENAMETOOLONG, ENAMETOOLONG, "File name too long" }, - { BSM_EOVERFLOW, EOVERFLOW, "Value too large to be stored in data type" }, - { BSM_ENOTUNIQ, + { BSM_ERRNO_ENAMETOOLONG, ENAMETOOLONG, "File name too long" }, + { BSM_ERRNO_EOVERFLOW, EOVERFLOW, "Value too large to be stored in data type" }, + { BSM_ERRNO_ENOTUNIQ, #ifdef ENOTUNIQ ENOTUNIQ, #else ERRNO_NO_LOCAL_MAPPING, #endif "Given log name not unique" }, - { BSM_EBADFD, + { BSM_ERRNO_EBADFD, #ifdef EBADFD EBADFD, #else ERRNO_NO_LOCAL_MAPPING, #endif "Given f.d. invalid for this operation" }, - { BSM_EREMCHG, + { BSM_ERRNO_EREMCHG, #ifdef EREMCHG EREMCHG, #else ERRNO_NO_LOCAL_MAPPING, #endif "Remote address changed" }, - { BSM_ELIBACC, + { BSM_ERRNO_ELIBACC, #ifdef ELIBACC ELIBACC, #else ERRNO_NO_LOCAL_MAPPING, #endif "Can't access a needed shared lib" }, - { BSM_ELIBBAD, + { BSM_ERRNO_ELIBBAD, #ifdef ELIBBAD ELIBBAD, #else ERRNO_NO_LOCAL_MAPPING, #endif "Accessing a corrupted shared lib" }, - { BSM_ELIBSCN, + { BSM_ERRNO_ELIBSCN, #ifdef ELIBSCN ELIBSCN, #else ERRNO_NO_LOCAL_MAPPING, #endif ".lib section in a.out corrupted" }, - { BSM_ELIBMAX, + { BSM_ERRNO_ELIBMAX, #ifdef ELIBMAX ELIBMAX, #else ERRNO_NO_LOCAL_MAPPING, #endif "Attempting to link in too many libs" }, - { BSM_ELIBEXEC, + { BSM_ERRNO_ELIBEXEC, #ifdef ELIBEXEC ELIBEXEC, #else ERRNO_NO_LOCAL_MAPPING, #endif "Attempting to exec a shared library" }, - { BSM_EILSEQ, EILSEQ, "Illegal byte sequence" }, - { BSM_ENOSYS, ENOSYS, "Function not implemented" }, - { BSM_ELOOP, ELOOP, "Too many levels of symbolic links" }, - { BSM_ERESTART, + { BSM_ERRNO_EILSEQ, EILSEQ, "Illegal byte sequence" }, + { BSM_ERRNO_ENOSYS, ENOSYS, "Function not implemented" }, + { BSM_ERRNO_ELOOP, ELOOP, "Too many levels of symbolic links" }, + { BSM_ERRNO_ERESTART, #ifdef ERESTART ERESTART, #else ERRNO_NO_LOCAL_MAPPING, #endif "Restart syscall" }, - { BSM_ESTRPIPE, + { BSM_ERRNO_ESTRPIPE, #ifdef ESTRPIPE ESTRPIPE, #else ERRNO_NO_LOCAL_MAPPING, #endif "If pipe/FIFO, don't sleep in stream head" }, - { BSM_ENOTEMPTY, ENOTEMPTY, "Directory not empty" }, - { BSM_EUSERS, EUSERS, "Too many users" }, - { BSM_ENOTSOCK, ENOTSOCK, "Socket operation on non-socket" }, - { BSM_EDESTADDRREQ, EDESTADDRREQ, "Destination address required" }, - { BSM_EMSGSIZE, EMSGSIZE, "Message too long" }, - { BSM_EPROTOTYPE, EPROTOTYPE, "Protocol wrong type for socket" }, - { BSM_ENOPROTOOPT, ENOPROTOOPT, "Protocol not available" }, - { BSM_EPROTONOSUPPORT, EPROTONOSUPPORT, "Protocol not supported" }, - { BSM_ESOCKTNOSUPPORT, ESOCKTNOSUPPORT, "Socket type not supported" }, - { BSM_EOPNOTSUPP, EOPNOTSUPP, "Operation not supported" }, - { BSM_EPFNOSUPPORT, EPFNOSUPPORT, "Protocol family not supported" }, - { BSM_EAFNOSUPPORT, EAFNOSUPPORT, "Address family not supported by protocol family" }, - { BSM_EADDRINUSE, EADDRINUSE, "Address already in use" }, - { BSM_EADDRNOTAVAIL, EADDRNOTAVAIL, "Can't assign requested address" }, - { BSM_ENETDOWN, ENETDOWN, "Network is down" }, - { BSM_ENETRESET, ENETRESET, "Network dropped connection on reset" }, - { BSM_ECONNABORTED, ECONNABORTED, "Software caused connection abort" }, - { BSM_ECONNRESET, ECONNRESET, "Connection reset by peer" }, - { BSM_ENOBUFS, ENOBUFS, "No buffer space available" }, - { BSM_EISCONN, EISCONN, "Socket is already connected" }, - { BSM_ENOTCONN, ENOTCONN, "Socket is not connected" }, - { BSM_ESHUTDOWN, ESHUTDOWN, "Can't send after socket shutdown" }, - { BSM_ETOOMANYREFS, ETOOMANYREFS, "Too many references: can't splice" }, - { BSM_ETIMEDOUT, ETIMEDOUT, "Operation timed out" }, - { BSM_ECONNREFUSED, ECONNREFUSED, "Connection refused" }, - { BSM_EHOSTDOWN, EHOSTDOWN, "Host is down" }, - { BSM_EHOSTUNREACH, EHOSTUNREACH, "No route to host" }, - { BSM_EALREADY, EALREADY, "Operation already in progress" }, - { BSM_EINPROGRESS, EINPROGRESS, "Operation now in progress" }, - { BSM_ESTALE, ESTALE, "Stale NFS file handle" }, - { BSM_EPWROFF, + { BSM_ERRNO_ENOTEMPTY, ENOTEMPTY, "Directory not empty" }, + { BSM_ERRNO_EUSERS, EUSERS, "Too many users" }, + { BSM_ERRNO_ENOTSOCK, ENOTSOCK, "Socket operation on non-socket" }, + { BSM_ERRNO_EDESTADDRREQ, EDESTADDRREQ, "Destination address required" }, + { BSM_ERRNO_EMSGSIZE, EMSGSIZE, "Message too long" }, + { BSM_ERRNO_EPROTOTYPE, EPROTOTYPE, "Protocol wrong type for socket" }, + { BSM_ERRNO_ENOPROTOOPT, ENOPROTOOPT, "Protocol not available" }, + { BSM_ERRNO_EPROTONOSUPPORT, EPROTONOSUPPORT, "Protocol not supported" }, + { BSM_ERRNO_ESOCKTNOSUPPORT, ESOCKTNOSUPPORT, "Socket type not supported" }, + { BSM_ERRNO_EOPNOTSUPP, EOPNOTSUPP, "Operation not supported" }, + { BSM_ERRNO_EPFNOSUPPORT, EPFNOSUPPORT, "Protocol family not supported" }, + { BSM_ERRNO_EAFNOSUPPORT, EAFNOSUPPORT, "Address family not supported by protocol family" }, + { BSM_ERRNO_EADDRINUSE, EADDRINUSE, "Address already in use" }, + { BSM_ERRNO_EADDRNOTAVAIL, EADDRNOTAVAIL, "Can't assign requested address" }, + { BSM_ERRNO_ENETDOWN, ENETDOWN, "Network is down" }, + { BSM_ERRNO_ENETRESET, ENETRESET, "Network dropped connection on reset" }, + { BSM_ERRNO_ECONNABORTED, ECONNABORTED, "Software caused connection abort" }, + { BSM_ERRNO_ECONNRESET, ECONNRESET, "Connection reset by peer" }, + { BSM_ERRNO_ENOBUFS, ENOBUFS, "No buffer space available" }, + { BSM_ERRNO_EISCONN, EISCONN, "Socket is already connected" }, + { BSM_ERRNO_ENOTCONN, ENOTCONN, "Socket is not connected" }, + { BSM_ERRNO_ESHUTDOWN, ESHUTDOWN, "Can't send after socket shutdown" }, + { BSM_ERRNO_ETOOMANYREFS, ETOOMANYREFS, "Too many references: can't splice" }, + { BSM_ERRNO_ETIMEDOUT, ETIMEDOUT, "Operation timed out" }, + { BSM_ERRNO_ECONNREFUSED, ECONNREFUSED, "Connection refused" }, + { BSM_ERRNO_EHOSTDOWN, EHOSTDOWN, "Host is down" }, + { BSM_ERRNO_EHOSTUNREACH, EHOSTUNREACH, "No route to host" }, + { BSM_ERRNO_EALREADY, EALREADY, "Operation already in progress" }, + { BSM_ERRNO_EINPROGRESS, EINPROGRESS, "Operation now in progress" }, + { BSM_ERRNO_ESTALE, ESTALE, "Stale NFS file handle" }, + { BSM_ERRNO_EPWROFF, #ifdef EPWROFF EPWROFF, #else ERRNO_NO_LOCAL_MAPPING, #endif "Device power is off" }, - { BSM_EDEVERR, + { BSM_ERRNO_EDEVERR, #ifdef EDEVERR EDEVERR, #else ERRNO_NO_LOCAL_MAPPING, #endif "Device error" }, - { BSM_EBADEXEC, + { BSM_ERRNO_EBADEXEC, #ifdef EBADEXEC EBADEXEC, #else ERRNO_NO_LOCAL_MAPPING, #endif "Bad executable" }, - { BSM_EBADARCH, + { BSM_ERRNO_EBADARCH, #ifdef EBADARCH EBADARCH, #else ERRNO_NO_LOCAL_MAPPING, #endif "Bad CPU type in executable" }, - { BSM_ESHLIBVERS, + { BSM_ERRNO_ESHLIBVERS, #ifdef ESHLIBVERS ESHLIBVERS, #else ERRNO_NO_LOCAL_MAPPING, #endif "Shared library version mismatch" }, - { BSM_EBADMACHO, + { BSM_ERRNO_EBADMACHO, #ifdef EBADMACHO EBADMACHO, #else ERRNO_NO_LOCAL_MAPPING, #endif "Malfored Macho file" }, - { BSM_EPOLICY, + { BSM_ERRNO_EPOLICY, #ifdef EPOLICY EPOLICY, #else ERRNO_NO_LOCAL_MAPPING, #endif "Operation failed by policy" }, - { BSM_EDOTDOT, + { BSM_ERRNO_EDOTDOT, #ifdef EDOTDOT EDOTDOT, #else ERRNO_NO_LOCAL_MAPPING, #endif "RFS specific error" }, - { BSM_EUCLEAN, + { BSM_ERRNO_EUCLEAN, #ifdef EUCLEAN EUCLEAN, #else ERRNO_NO_LOCAL_MAPPING, #endif "Structure needs cleaning" }, - { BSM_ENOTNAM, + { BSM_ERRNO_ENOTNAM, #ifdef ENOTNAM ENOTNAM, #else ERRNO_NO_LOCAL_MAPPING, #endif "Not a XENIX named type file" }, - { BSM_ENAVAIL, + { BSM_ERRNO_ENAVAIL, #ifdef ENAVAIL ENAVAIL, #else ERRNO_NO_LOCAL_MAPPING, #endif "No XENIX semaphores available" }, - { BSM_EISNAM, + { BSM_ERRNO_EISNAM, #ifdef EISNAM EISNAM, #else ERRNO_NO_LOCAL_MAPPING, #endif "Is a named type file" }, - { BSM_EREMOTEIO, + { BSM_ERRNO_EREMOTEIO, #ifdef EREMOTEIO EREMOTEIO, #else ERRNO_NO_LOCAL_MAPPING, #endif "Remote I/O error" }, - { BSM_ENOMEDIUM, + { BSM_ERRNO_ENOMEDIUM, #ifdef ENOMEDIUM ENOMEDIUM, #else ERRNO_NO_LOCAL_MAPPING, #endif "No medium found" }, - { BSM_EMEDIUMTYPE, + { BSM_ERRNO_EMEDIUMTYPE, #ifdef EMEDIUMTYPE EMEDIUMTYPE, #else ERRNO_NO_LOCAL_MAPPING, #endif "Wrong medium type" }, - { BSM_ENOKEY, + { BSM_ERRNO_ENOKEY, #ifdef ENOKEY ENOKEY, #else ERRNO_NO_LOCAL_MAPPING, #endif "Required key not available" }, - { BSM_EKEYEXPIRED, + { BSM_ERRNO_EKEYEXPIRED, #ifdef EKEEXPIRED EKEYEXPIRED, #else ERRNO_NO_LOCAL_MAPPING, #endif "Key has expired" }, - { BSM_EKEYREVOKED, + { BSM_ERRNO_EKEYREVOKED, #ifdef EKEYREVOKED EKEYREVOKED, #else ERRNO_NO_LOCAL_MAPPING, #endif "Key has been revoked" }, - { BSM_EKEYREJECTED, + { BSM_ERRNO_EKEYREJECTED, #ifdef EKEREJECTED EKEYREJECTED, #else @@ -595,7 +595,7 @@ * Converstion from a BSM error to a local error number may fail if either * OpenBSM doesn't recognize the error on the wire, or because there is no * appropriate local mapping. However, we don't allow conversion to BSM to - * fail, we just convert to BSM_UKNOWNERR. + * fail, we just convert to BSM_ERRNO_UNKNOWN. */ int au_bsm_to_errno(u_char bsm_error, int *errorp) @@ -619,10 +619,10 @@ * because it is ambiguous we just return an error. */ if (error == ERRNO_NO_LOCAL_MAPPING) - return (BSM_UNKNOWNERR); + return (BSM_ERRNO_UNKNOWN); bsme = au_bsm_error_lookup_errno(error); if (bsme == NULL) - return (BSM_UNKNOWNERR); + return (BSM_ERRNO_UNKNOWN); return (bsme->be_bsm_error); } ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#5 $ */ #ifndef _BSM_AUDIT_ERRNO_H_ @@ -41,128 +41,128 @@ * * When adding constants here, also add them to bsm_errno.c. */ -#define BSM_ESUCCESS 0 -#define BSM_EPERM 1 -#define BSM_ENOENT 2 -#define BSM_ESRCH 3 -#define BSM_EINTR 4 -#define BSM_EIO 5 -#define BSM_ENXIO 6 -#define BSM_E2BIG 7 -#define BSM_ENOEXEC 8 -#define BSM_EBADF 9 -#define BSM_ECHILD 10 -#define BSM_EAGAIN 11 -#define BSM_ENOMEM 12 -#define BSM_EACCES 13 -#define BSM_EFAULT 14 -#define BSM_ENOTBLK 15 -#define BSM_EBUSY 16 -#define BSM_EEXIST 17 -#define BSM_EXDEV 18 -#define BSM_ENODEV 19 -#define BSM_ENOTDIR 20 -#define BSM_EISDIR 21 -#define BSM_EINVAL 22 -#define BSM_ENFILE 23 -#define BSM_EMFILE 24 -#define BSM_ENOTTY 25 -#define BSM_ETXTBSY 26 -#define BSM_EFBIG 27 -#define BSM_ENOSPC 28 -#define BSM_ESPIPE 29 -#define BSM_EROFS 30 -#define BSM_EMLINK 31 -#define BSM_EPIPE 32 -#define BSM_EDOM 33 -#define BSM_ERANGE 34 -#define BSM_ENOMSG 35 -#define BSM_EIDRM 36 -#define BSM_ECHRNG 37 /* Solaris/Linux-specific. */ -#define BSM_EL2NSYNC 38 /* Solaris/Linux-specific. */ -#define BSM_EL3HLT 39 /* Solaris/Linux-specific. */ -#define BSM_EL3RST 40 /* Solaris/Linux-specific. */ -#define BSM_ELNRNG 41 /* Solaris/Linux-specific. */ -#define BSM_EUNATCH 42 /* Solaris/Linux-specific. */ -#define BSM_ENOCSI 43 /* Solaris/Linux-specific. */ -#define BSM_EL2HLT 44 /* Solaris/Linux-specific. */ -#define BSM_EDEADLK 45 -#define BSM_ENOLCK 46 -#define BSM_ECANCELED 47 -#define BSM_ENOTSUP 48 -#define BSM_EDQUOT 49 -#define BSM_EBADE 50 /* Solaris/Linux-specific. */ -#define BSM_EBADR 51 /* Solaris/Linux-specific. */ -#define BSM_EXFULL 52 /* Solaris/Linux-specific. */ -#define BSM_ENOANO 53 /* Solaris/Linux-specific. */ -#define BSM_EBADRQC 54 /* Solaris/Linux-specific. */ -#define BSM_EBADSLT 55 /* Solaris/Linux-specific. */ -#define BSM_EDEADLOCK 56 /* Solaris-specific. */ -#define BSM_EBFONT 57 /* Solaris/Linux-specific. */ -#define BSM_EOWNERDEAD 58 /* Solaris/Linux-specific. */ -#define BSM_ENOTRECOVERABLE 59 /* Solaris/Linux-specific. */ -#define BSM_ENOSTR 60 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENODATA 61 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ETIME 62 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENOSR 63 /* Solaris/Darwin/Linux-specific. */ -#define BSM_ENONET 64 /* Solaris/Linux-specific. */ -#define BSM_ENOPKG 65 /* Solaris/Linux-specific. */ -#define BSM_EREMOTE 66 -#define BSM_ENOLINK 67 -#define BSM_EADV 68 /* Solaris/Linux-specific. */ -#define BSM_ESRMNT 69 /* Solaris/Linux-specific. */ -#define BSM_ECOMM 70 /* Solaris/Linux-specific. */ -#define BSM_EPROTO 71 -#define BSM_ELOCKUNMAPPED 72 /* Solaris-specific. */ -#define BSM_ENOTACTIVE 73 /* Solaris-specific. */ -#define BSM_EMULTIHOP 74 -#define BSM_EBADMSG 77 -#define BSM_ENAMETOOLONG 78 -#define BSM_EOVERFLOW 79 -#define BSM_ENOTUNIQ 80 /* Solaris/Linux-specific. */ -#define BSM_EBADFD 81 /* Solaris/Linux-specific. */ -#define BSM_EREMCHG 82 /* Solaris/Linux-specific. */ -#define BSM_ELIBACC 83 /* Solaris/Linux-specific. */ -#define BSM_ELIBBAD 84 /* Solaris/Linux-specific. */ -#define BSM_ELIBSCN 85 /* Solaris/Linux-specific. */ -#define BSM_ELIBMAX 86 /* Solaris/Linux-specific. */ -#define BSM_ELIBEXEC 87 /* Solaris/Linux-specific. */ -#define BSM_EILSEQ 88 -#define BSM_ENOSYS 89 -#define BSM_ELOOP 90 -#define BSM_ERESTART 91 -#define BSM_ESTRPIPE 92 /* Solaris/Linux-specific. */ -#define BSM_ENOTEMPTY 93 -#define BSM_EUSERS 94 -#define BSM_ENOTSOCK 95 -#define BSM_EDESTADDRREQ 96 -#define BSM_EMSGSIZE 97 -#define BSM_EPROTOTYPE 98 -#define BSM_ENOPROTOOPT 99 -#define BSM_EPROTONOSUPPORT 120 -#define BSM_ESOCKTNOSUPPORT 121 -#define BSM_EOPNOTSUPP 122 -#define BSM_EPFNOSUPPORT 123 -#define BSM_EAFNOSUPPORT 124 -#define BSM_EADDRINUSE 125 -#define BSM_EADDRNOTAVAIL 126 -#define BSM_ENETDOWN 127 -#define BSM_ENETUNREACH 128 -#define BSM_ENETRESET 129 -#define BSM_ECONNABORTED 130 -#define BSM_ECONNRESET 131 -#define BSM_ENOBUFS 132 -#define BSM_EISCONN 133 -#define BSM_ENOTCONN 134 -#define BSM_ESHUTDOWN 143 -#define BSM_ETOOMANYREFS 144 -#define BSM_ETIMEDOUT 145 -#define BSM_ECONNREFUSED 146 -#define BSM_EHOSTDOWN 147 -#define BSM_EHOSTUNREACH 148 -#define BSM_EALREADY 149 -#define BSM_EINPROGRESS 150 -#define BSM_ESTALE 151 +#define BSM_ERRNO_ESUCCESS 0 +#define BSM_ERRNO_EPERM 1 +#define BSM_ERRNO_ENOENT 2 +#define BSM_ERRNO_ESRCH 3 +#define BSM_ERRNO_EINTR 4 +#define BSM_ERRNO_EIO 5 +#define BSM_ERRNO_ENXIO 6 +#define BSM_ERRNO_E2BIG 7 +#define BSM_ERRNO_ENOEXEC 8 +#define BSM_ERRNO_EBADF 9 +#define BSM_ERRNO_ECHILD 10 +#define BSM_ERRNO_EAGAIN 11 +#define BSM_ERRNO_ENOMEM 12 +#define BSM_ERRNO_EACCES 13 +#define BSM_ERRNO_EFAULT 14 +#define BSM_ERRNO_ENOTBLK 15 +#define BSM_ERRNO_EBUSY 16 +#define BSM_ERRNO_EEXIST 17 +#define BSM_ERRNO_EXDEV 18 +#define BSM_ERRNO_ENODEV 19 +#define BSM_ERRNO_ENOTDIR 20 +#define BSM_ERRNO_EISDIR 21 +#define BSM_ERRNO_EINVAL 22 +#define BSM_ERRNO_ENFILE 23 +#define BSM_ERRNO_EMFILE 24 +#define BSM_ERRNO_ENOTTY 25 +#define BSM_ERRNO_ETXTBSY 26 +#define BSM_ERRNO_EFBIG 27 +#define BSM_ERRNO_ENOSPC 28 +#define BSM_ERRNO_ESPIPE 29 +#define BSM_ERRNO_EROFS 30 +#define BSM_ERRNO_EMLINK 31 +#define BSM_ERRNO_EPIPE 32 +#define BSM_ERRNO_EDOM 33 +#define BSM_ERRNO_ERANGE 34 +#define BSM_ERRNO_ENOMSG 35 +#define BSM_ERRNO_EIDRM 36 +#define BSM_ERRNO_ECHRNG 37 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL2NSYNC 38 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL3HLT 39 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL3RST 40 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELNRNG 41 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EUNATCH 42 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOCSI 43 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EL2HLT 44 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EDEADLK 45 +#define BSM_ERRNO_ENOLCK 46 +#define BSM_ERRNO_ECANCELED 47 +#define BSM_ERRNO_ENOTSUP 48 +#define BSM_ERRNO_EDQUOT 49 +#define BSM_ERRNO_EBADE 50 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADR 51 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EXFULL 52 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOANO 53 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADRQC 54 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADSLT 55 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EDEADLOCK 56 /* Solaris-specific. */ +#define BSM_ERRNO_EBFONT 57 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EOWNERDEAD 58 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOTRECOVERABLE 59 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOSTR 60 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENODATA 61 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ETIME 62 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENOSR 63 /* Solaris/Darwin/Linux-specific. */ +#define BSM_ERRNO_ENONET 64 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOPKG 65 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EREMOTE 66 +#define BSM_ERRNO_ENOLINK 67 +#define BSM_ERRNO_EADV 68 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ESRMNT 69 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ECOMM 70 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EPROTO 71 +#define BSM_ERRNO_ELOCKUNMAPPED 72 /* Solaris-specific. */ +#define BSM_ERRNO_ENOTACTIVE 73 /* Solaris-specific. */ +#define BSM_ERRNO_EMULTIHOP 74 +#define BSM_ERRNO_EBADMSG 77 +#define BSM_ERRNO_ENAMETOOLONG 78 +#define BSM_ERRNO_EOVERFLOW 79 +#define BSM_ERRNO_ENOTUNIQ 80 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EBADFD 81 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EREMCHG 82 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBACC 83 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBBAD 84 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBSCN 85 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBMAX 86 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ELIBEXEC 87 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_EILSEQ 88 +#define BSM_ERRNO_ENOSYS 89 +#define BSM_ERRNO_ELOOP 90 +#define BSM_ERRNO_ERESTART 91 +#define BSM_ERRNO_ESTRPIPE 92 /* Solaris/Linux-specific. */ +#define BSM_ERRNO_ENOTEMPTY 93 +#define BSM_ERRNO_EUSERS 94 +#define BSM_ERRNO_ENOTSOCK 95 +#define BSM_ERRNO_EDESTADDRREQ 96 +#define BSM_ERRNO_EMSGSIZE 97 +#define BSM_ERRNO_EPROTOTYPE 98 +#define BSM_ERRNO_ENOPROTOOPT 99 +#define BSM_ERRNO_EPROTONOSUPPORT 120 +#define BSM_ERRNO_ESOCKTNOSUPPORT 121 +#define BSM_ERRNO_EOPNOTSUPP 122 +#define BSM_ERRNO_EPFNOSUPPORT 123 +#define BSM_ERRNO_EAFNOSUPPORT 124 +#define BSM_ERRNO_EADDRINUSE 125 +#define BSM_ERRNO_EADDRNOTAVAIL 126 +#define BSM_ERRNO_ENETDOWN 127 +#define BSM_ERRNO_ENETUNREACH 128 +#define BSM_ERRNO_ENETRESET 129 +#define BSM_ERRNO_ECONNABORTED 130 +#define BSM_ERRNO_ECONNRESET 131 +#define BSM_ERRNO_ENOBUFS 132 +#define BSM_ERRNO_EISCONN 133 +#define BSM_ERRNO_ENOTCONN 134 +#define BSM_ERRNO_ESHUTDOWN 143 +#define BSM_ERRNO_ETOOMANYREFS 144 +#define BSM_ERRNO_ETIMEDOUT 145 +#define BSM_ERRNO_ECONNREFUSED 146 +#define BSM_ERRNO_EHOSTDOWN 147 +#define BSM_ERRNO_EHOSTUNREACH 148 +#define BSM_ERRNO_EALREADY 149 +#define BSM_ERRNO_EINPROGRESS 150 +#define BSM_ERRNO_ESTALE 151 /* * OpenBSM constants for error numbers not defined in Solaris. In the event @@ -171,44 +171,44 @@ * * ELAST doesn't get a constant in the BSM space. */ -#define BSM_EPROCLIM 190 /* FreeBSD/Darwin-specific. */ -#define BSM_EBADRPC 191 /* FreeBSD/Darwin-specific. */ -#define BSM_ERPCMISMATCH 192 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROGUNAVAIL 193 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROGMISMATCH 194 /* FreeBSD/Darwin-specific. */ -#define BSM_EPROCUNAVAIL 195 /* FreeBSD/Darwin-specific. */ -#define BSM_EFTYPE 196 /* FreeBSD/Darwin-specific. */ -#define BSM_EAUTH 197 /* FreeBSD/Darwin-specific. */ -#define BSM_ENEEDAUTH 198 /* FreeBSD/Darwin-specific. */ -#define BSM_ENOATTR 199 /* FreeBSD/Darwin-specific. */ -#define BSM_EDOOFUS 200 /* FreeBSD-specific. */ -#define BSM_EJUSTRETURN 201 /* FreeBSD-specific. */ -#define BSM_ENOIOCTL 202 /* FreeBSD-specific. */ -#define BSM_EDIRIOCTL 203 /* FreeBSD-specific. */ -#define BSM_EPWROFF 204 /* Darwin-specific. */ -#define BSM_EDEVERR 205 /* Darwin-specific. */ -#define BSM_EBADEXEC 206 /* Darwin-specific. */ -#define BSM_EBADARCH 207 /* Darwin-specific. */ -#define BSM_ESHLIBVERS 208 /* Darwin-specific. */ -#define BSM_EBADMACHO 209 /* Darwin-specific. */ -#define BSM_EPOLICY 210 /* Darwin-specific. */ -#define BSM_EDOTDOT 211 /* Linux-specific. */ -#define BSM_EUCLEAN 212 /* Linux-specific. */ -#define BSM_ENOTNAM 213 /* Linux(Xenix?)-specific. */ -#define BSM_ENAVAIL 214 /* Linux(Xenix?)-specific. */ -#define BSM_EISNAM 215 /* Linux(Xenix?)-specific. */ -#define BSM_EREMOTEIO 216 /* Linux-specific. */ -#define BSM_ENOMEDIUM 217 /* Linux-specific. */ -#define BSM_EMEDIUMTYPE 218 /* Linux-specific. */ -#define BSM_ENOKEY 219 /* Linux-specific. */ -#define BSM_EKEYEXPIRED 220 /* Linux-specific. */ -#define BSM_EKEYREVOKED 221 /* Linux-specific. */ -#define BSM_EKEYREJECTED 222 /* Linux-specific. */ +#define BSM_ERRNO_EPROCLIM 190 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EBADRPC 191 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_ERPCMISMATCH 192 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROGUNAVAIL 193 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROGMISMATCH 194 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EPROCUNAVAIL 195 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EFTYPE 196 /* FreeBSD/Darwin-specific. */ +#define BSM_ERRNO_EAUTH 197 /* FreeBSD/Darwin-specific. */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812272309.mBRN9aDK028991>