diff options
| -rw-r--r-- | src/daemon/abrt-action-save-package-data.c | 26 | ||||
| -rw-r--r-- | src/lib/dump_dir.c | 1 |
2 files changed, 1 insertions, 26 deletions
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c index d87ffd59..5be712cf 100644 --- a/src/daemon/abrt-action-save-package-data.c +++ b/src/daemon/abrt-action-save-package-data.c @@ -123,19 +123,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) goto ret; /* return 1 (failure) */ dd_save_text(dd, FILENAME_PACKAGE, ""); dd_save_text(dd, FILENAME_COMPONENT, ""); -//TODO: move hostname saving to a more logical place - if (!remote) - { - char host[HOST_NAME_MAX + 1]; - int ret = gethostname(host, HOST_NAME_MAX); - if (ret < 0) - { - perror_msg("gethostname"); - host[0] = '\0'; - } - host[HOST_NAME_MAX] = '\0'; - dd_save_text(dd, FILENAME_HOSTNAME, host); - } goto ret0; /* no error */ } log("Executable '%s' doesn't belong to any package", executable); @@ -231,19 +218,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) { dd_save_text(dd, FILENAME_COMPONENT, component); } -//TODO: move hostname saving to a more logical place - if (!remote) - { - char host[HOST_NAME_MAX + 1]; - int ret = gethostname(host, HOST_NAME_MAX); - if (ret < 0) - { - perror_msg("gethostname"); - host[0] = '\0'; - } - host[HOST_NAME_MAX] = '\0'; - dd_save_text(dd, FILENAME_HOSTNAME, host); - } dd_close(dd); diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c index f4f3f5c4..379e968e 100644 --- a/src/lib/dump_dir.c +++ b/src/lib/dump_dir.c @@ -482,6 +482,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid) uname(&buf); /* never fails */ dd_save_text(dd, FILENAME_KERNEL, buf.release); dd_save_text(dd, FILENAME_ARCHITECTURE, buf.machine); + dd_save_text(dd, FILENAME_HOSTNAME, buf.nodename); char *release = load_text_file("/etc/system-release", DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE); |