diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-03-02 22:27:50 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-03-02 22:27:50 +0000 |
| commit | 81811a3a278f3a16fa5849939edeb2d9efe51b28 (patch) | |
| tree | 55245cd5684df2d883a8bc21fea59b23fdf1a260 | |
| parent | 47881bd74fcb7d6c68c98acc332d3a4ccdcea836 (diff) | |
Merged revisions 11609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r11609 | tilghman | 2006-03-02 16:26:30 -0600 (Thu, 02 Mar 2006) | 2 lines
Bug 6637 - Fixes for Solaris
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | asterisk.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/asterisk.c b/asterisk.c index c980352e6..0b4b12a3d 100644 --- a/asterisk.c +++ b/asterisk.c @@ -82,6 +82,9 @@ #if defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS) #include <netdb.h> +#if defined(SOLARIS) +extern int daemon(int, int); /* defined in libresolv of all places */ +#endif #endif #include "asterisk.h" @@ -2160,7 +2163,7 @@ int main(int argc, char *argv[]) exit(1); } if (setgid(gr->gr_gid)) { - ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", gr->gr_gid, rungroup); + ast_log(LOG_WARNING, "Unable to setgid to %d (%s)\n", (int)gr->gr_gid, rungroup); exit(1); } if (setgroups(0, NULL)) { @@ -2180,7 +2183,7 @@ int main(int argc, char *argv[]) } if (!rungroup) { if (setgid(pw->pw_gid)) { - ast_log(LOG_WARNING, "Unable to setgid to %d!\n", pw->pw_gid); + ast_log(LOG_WARNING, "Unable to setgid to %d!\n", (int)pw->pw_gid); exit(1); } if (initgroups(pw->pw_name, pw->pw_gid)) { @@ -2189,7 +2192,7 @@ int main(int argc, char *argv[]) } } if (setuid(pw->pw_uid)) { - ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", pw->pw_uid, runuser); + ast_log(LOG_WARNING, "Unable to setuid to %d (%s)\n", (int)pw->pw_uid, runuser); exit(1); } setenv("ASTERISK_ALREADY_NONROOT","yes",1); @@ -2254,7 +2257,7 @@ int main(int argc, char *argv[]) unlink(ast_config_AST_PID); f = fopen(ast_config_AST_PID, "w"); if (f) { - fprintf(f, "%d\n", getpid()); + fprintf(f, "%d\n", (int)getpid()); fclose(f); } else ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno)); @@ -2265,7 +2268,7 @@ int main(int argc, char *argv[]) unlink(ast_config_AST_PID); f = fopen(ast_config_AST_PID, "w"); if (f) { - fprintf(f, "%d\n", getpid()); + fprintf(f, "%d\n", (int)getpid()); fclose(f); } else ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno)); |