diff options
| author | Wesley Shields <wxs@FreeBSD.org> | 2009-05-04 15:36:05 +0000 |
|---|---|---|
| committer | Wesley Shields <wxs@FreeBSD.org> | 2009-05-04 15:36:05 +0000 |
| commit | ce03a68eef1882d8f468fc69548754f164053527 (patch) | |
| tree | 83e6fcebd3d329521c0305a12997aea9487d8b1f /net-mgmt/nagios/files/patch-base-utils.c | |
| parent | - Update to 1.0.2 (diff) | |
- Fix runtime problem with embedded perl.
- Mark as MAKE_JOBS_UNSAFE.
- Stop using DISTVERSION and use PORTVERSION in net-mgmt/nagios.
PR: ports/134175
Submitted by: Jarrod Sayers <jarrod@netleader.com.au> (maintainer)
Notes
Notes:
svn path=/head/; revision=233210
Diffstat (limited to 'net-mgmt/nagios/files/patch-base-utils.c')
| -rw-r--r-- | net-mgmt/nagios/files/patch-base-utils.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/net-mgmt/nagios/files/patch-base-utils.c b/net-mgmt/nagios/files/patch-base-utils.c new file mode 100644 index 000000000000..e4aa4a489b82 --- /dev/null +++ b/net-mgmt/nagios/files/patch-base-utils.c @@ -0,0 +1,38 @@ +--- base/utils.c.orig 2008-12-01 03:52:58.000000000 +1030 ++++ base/utils.c 2009-05-03 11:51:19.000000000 +0930 +@@ -3597,7 +3597,7 @@ + /* initializes embedded perl interpreter */ + int init_embedded_perl(char **env){ + #ifdef EMBEDDEDPERL +- char *embedding[]={ "", "" }; ++ char **embedding = NULL; + int exitstatus=0; + char *temp_buffer=NULL; + int argc=2; +@@ -3613,6 +3613,17 @@ + + else{ + ++ embedding = malloc(argc * sizeof(char *)); ++ if (embedding == NULL) { ++ use_embedded_perl = FALSE; ++ logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n"); ++ } else { ++ embedding[0] = malloc(sizeof(char)); ++ if (embedding[0] == NULL) { ++ use_embedded_perl = FALSE; ++ logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n"); ++ } else { ++ *embedding[0] = '\0'; + embedding[1]=p1_file; + + use_embedded_perl=TRUE; +@@ -3624,6 +3635,8 @@ + logit(NSLOG_RUNTIME_ERROR,TRUE,"Error: Could not allocate memory for embedded Perl interpreter!\n"); + } + } ++ } ++ } + + /* a fatal error occurred... */ + if(use_embedded_perl==FALSE){ |