PERFORCE change 154324 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=154324

Change 154324 by rwatson at rwatson_cinnamon on 2008/12/08 10:11:09

	audit_submit(3) accepts a local error number for reterr, rather than
	a BSM one, so perform the conversion.
	
	Pointed out by:	csjp

Affected files ...

.. //depot/projects/trustedbsd/openbsm/NEWS#18 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#15 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#28 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/NEWS#18 (text+ko) ====

@@ -2,6 +2,10 @@
 
 OpenBSM 1.1 alpha 4
 
+- With the addition of BSM error number mapping, we also need to map the
+  local error number passed to audit_submit(3) to a BSM error number, rather
+  than have the caller perform that conversion.
+
 OpenBSM 1.1 alpha 3
 
 - Add two new functions, au_bsm_to_errno() and au_errno_to_bsm(), to map
@@ -365,4 +369,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#17 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#18 $

==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#15 (text+ko) ====

@@ -27,7 +27,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/audit_submit.3#14 $
+.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#15 $
 .\"
 .Dd January 18, 2008
 .Dt audit_submit 3
@@ -58,7 +58,10 @@
 .Fa status
 and
 .Fa reterr
-arguments.
+arguments; unlike the argument to
+.Xr au_to_return ,
+.Fa reterr
+should be a local rather than BSM error number.
 Optionally, a text token will be created as a part of this record.
 .Pp
 Text token output is under the control of a

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#28 (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_wrappers.c#27 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#28 $
  */
 
 #ifdef __APPLE__
@@ -178,7 +178,7 @@
 			return (-1);
 		}
 	}
-	token = au_to_return32(status, reterr);
+	token = au_to_return32(status, au_errno_to_bsm(reterr));
 	if (token == NULL) {
 		syslog(LOG_AUTH | LOG_ERR,
 		    "audit: enable to build return token");