From: Jule Anger <janger@samba.org>
Date: Thu, 31 Mar 2022 09:04:52 +0000 (+0200)
Subject: smbstatus: add general information to the json output
X-Git-Tag: samba-4.17.0rc1~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05362a2799573ed314bbeb907dab11829732babe;p=thirdparty%2Fsamba.git

smbstatus: add general information to the json output

Adds timestamp, samba version and path to smb.conf to a given json
object.

Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 20a49a69b67..28e673db09a 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -965,6 +965,7 @@ int main(int argc, const char *argv[])
 
 #ifdef HAVE_JANSSON
 	state.root_json = json_new_object();
+	add_general_information_to_json(&state);
 #endif /* HAVE_JANSSON */
 
 	if (getuid() != geteuid()) {
diff --git a/source3/utils/status_json.c b/source3/utils/status_json.c
index e9e04026a15..59d1a6bf85e 100644
--- a/source3/utils/status_json.c
+++ b/source3/utils/status_json.c
@@ -27,6 +27,28 @@
 #include "audit_logging.h" /* various JSON helpers */
 #include "auth/common_auth.h"
 
+int add_general_information_to_json(struct traverse_state *state)
+{
+	int result;
+
+	result = json_add_timestamp(&state->root_json);
+	if (result < 0) {
+		return -1;
+	}
+
+	result = json_add_string(&state->root_json, "version", samba_version_string());
+	if (result < 0) {
+		return -1;
+	}
+
+	result = json_add_string(&state->root_json, "smb_conf", get_dyn_CONFIGFILE());
+	if (result < 0) {
+		return -1;
+	}
+
+	return 0;
+}
+
 int add_section_to_json(struct traverse_state *state,
 			const char *key)
 {
diff --git a/source3/utils/status_json.h b/source3/utils/status_json.h
index abae91c65a9..b1c05c83597 100644
--- a/source3/utils/status_json.h
+++ b/source3/utils/status_json.h
@@ -25,4 +25,6 @@
 int add_section_to_json(struct traverse_state *state,
 			const char *key);
 
+int add_general_information_to_json(struct traverse_state *state);
+
 #endif
diff --git a/source3/utils/status_json_dummy.c b/source3/utils/status_json_dummy.c
index 0f6dd832705..bedd014b436 100644
--- a/source3/utils/status_json_dummy.c
+++ b/source3/utils/status_json_dummy.c
@@ -28,3 +28,8 @@ int add_section_to_json(struct traverse_state *state,
 {
 	return 0;
 }
+
+int add_general_information_to_json(struct traverse_state *state)
+{
+	return 0;
+}