From 8eee62086034a5b66b7357ebca7ba8e9d40290b9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 26 Apr 2019 14:31:46 +0000 Subject: [PATCH] dsdb:audit_log: avoid printing "... remote host [Unknown] SID [(NULL SID)] ..." We better print "... remote host [Unknown] SID [S-1-5-18] ..." in 'dsdb_audit' message, this matches what we print for 'dsdb_json_audit'. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13916 Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme (cherry picked from commit 706aba5bf62e674ae12786f6ab275752b8714464) --- source4/dsdb/samdb/ldb_modules/audit_log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source4/dsdb/samdb/ldb_modules/audit_log.c b/source4/dsdb/samdb/ldb_modules/audit_log.c index 16acf146194..cfa06682002 100644 --- a/source4/dsdb/samdb/ldb_modules/audit_log.c +++ b/source4/dsdb/samdb/ldb_modules/audit_log.c @@ -884,6 +884,7 @@ static char *operation_human_readable( { struct ldb_context *ldb = NULL; const char *remote_host = NULL; + const struct tsocket_address *remote = NULL; const struct dom_sid *sid = NULL; const char *user_sid = NULL; const char *timestamp = NULL; @@ -898,7 +899,8 @@ static char *operation_human_readable( ldb = ldb_module_get_ctx(module); remote_host = dsdb_audit_get_remote_host(ldb, ctx); - if (remote_host != NULL && dsdb_audit_is_system_session(module)) { + remote = dsdb_audit_get_remote_address(ldb); + if (remote != NULL && dsdb_audit_is_system_session(module)) { sid = dsdb_audit_get_actual_sid(ldb); } else { sid = dsdb_audit_get_user_sid(module); -- 2.17.1