aboutsummaryrefslogtreecommitdiffstats
path: root/version_info.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-03-04 23:57:55 +0000
committerGerald Combs <gerald@wireshark.org>2008-03-04 23:57:55 +0000
commit626cd5efaa407ac7312df4bb31978e8b73bf229a (patch)
tree55571ddcd3431282e52edb284e423dca1acb2ce5 /version_info.c
parentd9eba4345b66b8ee3919499ae964571d0b76a43a (diff)
Add a POSIX capabilities blurb to get_compiled_version_info().
svn path=/trunk/; revision=24561
Diffstat (limited to 'version_info.c')
-rw-r--r--version_info.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/version_info.c b/version_info.c
index 3fd4df1522..05b0b04b80 100644
--- a/version_info.c
+++ b/version_info.c
@@ -79,6 +79,10 @@
#include <CoreServices/CoreServices.h>
#endif
+#ifdef HAVE_LIBCAP
+# include <sys/capability.h>
+#endif
+
#ifdef SVNVERSION
const char *wireshark_svnversion = " (" SVNVERSION ")";
#else
@@ -154,6 +158,17 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *))
g_string_append(str, "without libz");
#endif /* HAVE_LIBZ */
+ /* LIBCAP */
+ g_string_append(str, ",\n");
+#ifdef HAVE_LIBCAP
+ g_string_append(str, "with POSIX capabilities");
+#ifdef _LINUX_CAPABILITY_VERSION
+ g_string_append(str, " (Linux)");
+#endif /* _LINUX_CAPABILITY_VERSION */
+#else /* HAVE_LIBCAP */
+ g_string_append(str, "without POSIX capabilities");
+#endif /* HAVE_LIBCAP */
+
/* Additional application-dependent information */
if (additional_info)
(*additional_info)(str);
@@ -424,7 +439,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
Gestalt(gestaltSystemVersionMajor, &macosx_major_ver);
Gestalt(gestaltSystemVersionMinor, &macosx_minor_ver);
Gestalt(gestaltSystemVersionBugFix, &macosx_bugfix_ver);
-
+
g_string_sprintfa(str, " (MacOS %ld.%ld.%ld)",
macosx_major_ver,
macosx_minor_ver,