Explicitly mark main() as public in executables to avoid an HP-UX

ld warning.

diff --git a/compat/mksiglist.c b/compat/mksiglist.c
index 287dfb5bb44497d45c83a7ac4635de5450bd664f..f3fc82fec5ea96ede85a281ac686e190ea159a0e 100644 (file)
--- a/compat/mksiglist.c
+++ b/compat/mksiglist.c
@@ -32,6 +32,8 @@
 
 #include "missing.h"
 
+__dso_public int main(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {

diff --git a/compat/mksigname.c b/compat/mksigname.c
index fcb8b33701af90f6ce09ce8337097dead9da8c9a..10b63246470cd359d76cbb9e6e8697ed170967ad 100644 (file)
--- a/compat/mksigname.c
+++ b/compat/mksigname.c
@@ -32,6 +32,8 @@
 
 #include "missing.h"
 
+__dso_public int main(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {

diff --git a/compat/regress/fnmatch/fnm_test.c b/compat/regress/fnmatch/fnm_test.c
index 2079e3b4a444b252bef55d82bf03ba015c526799..0fe9772aecf0a665bc8df8d7f41a54ffc0c4de06 100644 (file)
--- a/compat/regress/fnmatch/fnm_test.c
+++ b/compat/regress/fnmatch/fnm_test.c
@@ -20,6 +20,8 @@
 # include "compat/fnmatch.h"
 #endif
 
+__dso_public int main(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {

diff --git a/compat/regress/glob/globtest.c b/compat/regress/glob/globtest.c
index b4f61f24bf5313c31fb85eb2b7cccc827a40b298..8da3ed458b150fe9c739059188bf350c563c5701 100644 (file)
--- a/compat/regress/glob/globtest.c
+++ b/compat/regress/glob/globtest.c
@@ -33,6 +33,7 @@ struct gl_entry {
 };
 
 int test_glob(struct gl_entry *);
+__dso_public int main(int argc, char *argv[]);
 
 int
 main(int argc, char **argv)

diff --git a/plugins/sample_group/plugin_test.c b/plugins/sample_group/plugin_test.c
index ffb90a0e42c4751b9ba3bda659f9897b963dc225..9d75cb2929ec0fe8ddac39c88193feebeaf65fac 100644 (file)
--- a/plugins/sample_group/plugin_test.c
+++ b/plugins/sample_group/plugin_test.c
@@ -31,6 +31,8 @@
 
 #include "sudo_plugin.h"
 
+__dso_public int main(int argc, char *argv[]);
+
 /*
  * Simple driver to test sudoer group plugins.
  * usage: plugin_test [-p "plugin.so plugin_args ..."] user:group ...

diff --git a/plugins/sudoers/regress/check_symbols/check_symbols.c b/plugins/sudoers/regress/check_symbols/check_symbols.c
index 5e8218992cc15afd164875d70822fbf61e7da59e..98fb9cf146eac10d04b5de31b06a8f6a71adade0 100644 (file)
--- a/plugins/sudoers/regress/check_symbols/check_symbols.c
+++ b/plugins/sudoers/regress/check_symbols/check_symbols.c
@@ -50,6 +50,8 @@
 # define LINE_MAX 2048
 #endif
 
+__dso_public int main(int argc, char *argv[]);
+
 static void
 usage(void)
 {

diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
index 374b5fb90e81a80659efda01860c66edb6c17516..3a8c2940d9c39802258b35e3db7ab5b52afe3fa7 100644 (file)
--- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c
+++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
@@ -54,6 +54,8 @@ sudo_conv_t sudo_conv;                /* NULL in non-plugin */
 
 static char sessid[7];
 
+__dso_public int main(int argc, char *argv[]);
+
 static void
 usage(void)
 {

diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c
index 2b9b8a22c96aefa6a7c2442eda7646659a0ebd80..9be544be8d757d52bcba361c7dffbf1197346566 100644 (file)
--- a/plugins/sudoers/regress/logging/check_wrap.c
+++ b/plugins/sudoers/regress/logging/check_wrap.c
@@ -46,6 +46,8 @@ sudo_conv_t sudo_conv;                /* NULL in non-plugin */
 
 extern void writeln_wrap(FILE *fp, char *line, size_t len, size_t maxlen);
 
+__dso_public int main(int argc, char *argv[]);
+
 static void
 usage(void)
 {

diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c
index a73de59c7d5965c7f906d9942fc681448f27d17b..f71629643456c0da991d3677a890bed9d621087e 100644 (file)
--- a/plugins/sudoers/regress/parser/check_addr.c
+++ b/plugins/sudoers/regress/parser/check_addr.c
@@ -50,6 +50,7 @@
 #include "interfaces.h"
 
 static int check_addr_printf(int msg_type, const char *fmt, ...);
+__dso_public int main(int argc, char *argv[]);
 
 /* for match_addr.c */
 struct interface *interfaces;

diff --git a/plugins/sudoers/regress/parser/check_fill.c b/plugins/sudoers/regress/parser/check_fill.c
index d1132bf44bad1099de3380e524d2049372ce4c03..d7c8e3b4dfbf03eba4217cbcf1aa37b95eba7cee 100644 (file)
--- a/plugins/sudoers/regress/parser/check_fill.c
+++ b/plugins/sudoers/regress/parser/check_fill.c
@@ -48,6 +48,8 @@
 #include "sudo_plugin.h"
 #include <gram.h>
 
+__dso_public int main(int argc, char *argv[]);
+
 /*
  * TODO: test realloc
  */

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index adbc9bab616aa61eece9ddf9171603d3199d4153..921f7f35ed8c4f8161189b6c6257e45951f68c15 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -238,6 +238,8 @@ static size_t atomic_writev(int fd, struct iovec *iov, int iovcnt);
     (s)[8] == '/' && (s)[9] == 'l' && (s)[10] == 'o' && (s)[11] == 'g' && \
     (s)[12] == '\0')
 
+__dso_public int main(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 41856d1dff12a1f8aa3c614cc0a3fe623a7de7ad..ef96f0dd8a6a023b1074bb355f24189f1f24502f 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -127,6 +127,8 @@ extern char *malloc_options;
 extern int sudoersdebug;
 #endif
 
+__dso_public int main(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index d8248ee45a86fa3b340eecf6040802fe5e916c18..ff30eb2610274ff0372cb7f4fc906a967dda0042 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -144,6 +144,8 @@ static struct sudoersfile_list sudoerslist;
 static struct rbtree *alias_freelist;
 static bool checkonly;
 
+__dso_public int main(int argc, char *argv[]);
+
 int
 main(int argc, char *argv[])
 {

diff --git a/src/sesh.c b/src/sesh.c
index e6d57e5e487685dc56eb70a9ea016cd504b27a86..511c9d63888010d0a71bb764becf3dc3e01cda23 100644 (file)
--- a/src/sesh.c
+++ b/src/sesh.c
@@ -45,6 +45,8 @@
 
 sudo_conv_t sudo_conv;  /* NULL in non-plugin */
 
+__dso_public int main(int argc, char *argv[], char *envp[]);
+
 /*
  * Cleanup hook for error()/errorx()
  */

diff --git a/src/sudo.c b/src/sudo.c
index 583eb346560d832846b065bbf326cedca88dc1a9..c8ec005bac0e91eceac3bcaec1b569a0f2afbb7d 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -147,6 +147,8 @@ static struct rlimit corelimit;
 static struct rlimit nproclimit;
 #endif
 
+__dso_public int main(int argc, char *argv[], char *envp[]);
+
 int
 main(int argc, char *argv[], char *envp[])
 {