# HG changeset patch # User Marcus Granado <[email protected]> # Date 1266601820 0 # Node ID 3f967a4cfdc6de93bf2b943df0467447bef489f0 # Parent f2fcd9107ff04bdf6b32f1870f7ad15bba73746f CA-38046: remove CRs (^M) from audit-log records
because Windows c# thinks CRs are newlines. Signed-off-by: Marcus Granado <[email protected]> diff -r f2fcd9107ff0 -r 3f967a4cfdc6 ocaml/idl/ocaml_backend/rbac_audit.ml --- a/ocaml/idl/ocaml_backend/rbac_audit.ml Fri Feb 19 15:12:07 2010 +0000 +++ b/ocaml/idl/ocaml_backend/rbac_audit.ml Fri Feb 19 17:50:20 2010 +0000 @@ -330,6 +330,8 @@ ) in let line = Stringext.String.replace "\n" " " _line in (* no \n in line *) + let line = Stringext.String.replace "\r" " " line in (* no \r in line *) + let audit_line = append_line "%s" line in (*D.debug "line=%s, audit_line=%s" line audit_line;*) match !fn_append_to_master_audit_log with 1 file changed, 2 insertions(+) ocaml/idl/ocaml_backend/rbac_audit.ml | 2 ++
# HG changeset patch # User Marcus Granado <[email protected]> # Date 1266601820 0 # Node ID 3f967a4cfdc6de93bf2b943df0467447bef489f0 # Parent f2fcd9107ff04bdf6b32f1870f7ad15bba73746f CA-38046: remove CRs (^M) from audit-log records because Windows c# thinks CRs are newlines. Signed-off-by: Marcus Granado <[email protected]> diff -r f2fcd9107ff0 -r 3f967a4cfdc6 ocaml/idl/ocaml_backend/rbac_audit.ml --- a/ocaml/idl/ocaml_backend/rbac_audit.ml Fri Feb 19 15:12:07 2010 +0000 +++ b/ocaml/idl/ocaml_backend/rbac_audit.ml Fri Feb 19 17:50:20 2010 +0000 @@ -330,6 +330,8 @@ ) in let line = Stringext.String.replace "\n" " " _line in (* no \n in line *) + let line = Stringext.String.replace "\r" " " line in (* no \r in line *) + let audit_line = append_line "%s" line in (*D.debug "line=%s, audit_line=%s" line audit_line;*) match !fn_append_to_master_audit_log with
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
