Commit da55641a authored by Mike Hibler's avatar Mike Hibler

Add autoconf variable to control use of SelfLoader.

This is a fer-now hack.  Perl 5.10 has issues with bogus taint check
triggers that appear quite often when using the SelfLoader.  Now if you put:
    SELFLOADER_DATA=""
In your defs-* file, it will disable the uses that cause problems.  Yes,
the configure script should figure out if this is needed for you, but...
another time.
parent bae0ca71
......@@ -1588,6 +1588,7 @@ STANDALONE_CLEARINGHOUSE=0
NODE_USAGE_SUPPORT=0
EXP_VIS_SUPPORT=0
NOSTACKMIB=0
SELFLOADER_DATA="__DATA__"
#
# XXX You really don't want to change these!
......@@ -1952,6 +1953,16 @@ cat >> confdefs.h <<EOF
EOF
#
# Perl SelfLoader
# XXX this is a hack which enables us to disable it on versions of perl
# where there are problems with taint checking in the SelfLoader module.
#
cat >> confdefs.h <<EOF
#define SELFLOADER_DATA "$SELFLOADER_DATA"
EOF
#
# LEDA library path
#
......@@ -3094,6 +3105,7 @@ s%@GMAP_API_KEY@%$GMAP_API_KEY%g
s%@NODE_USAGE_SUPPORT@%$NODE_USAGE_SUPPORT%g
s%@NOSTACKMIB@%$NOSTACKMIB%g
s%@EXP_VIS_SUPPORT@%$EXP_VIS_SUPPORT%g
s%@SELFLOADER_DATA@%$SELFLOADER_DATA%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
s%@TBROBOCOPSEMAIL@%$TBROBOCOPSEMAIL%g
......
......@@ -219,6 +219,7 @@ AC_SUBST(GMAP_API_KEY)
AC_SUBST(NODE_USAGE_SUPPORT)
AC_SUBST(NOSTACKMIB)
AC_SUBST(EXP_VIS_SUPPORT)
AC_SUBST(SELFLOADER_DATA)
#
# Offer both versions of the email addresses that have the @ escaped
......@@ -307,6 +308,7 @@ STANDALONE_CLEARINGHOUSE=0
NODE_USAGE_SUPPORT=0
EXP_VIS_SUPPORT=0
NOSTACKMIB=0
SELFLOADER_DATA="__DATA__"
#
# XXX You really don't want to change these!
......@@ -546,6 +548,13 @@ if test -z "$EVENTSERVER"; then
fi
AC_DEFINE_UNQUOTED(EVENTSERVER, "$EVENTSERVER")
#
# Perl SelfLoader
# XXX this is a hack which enables us to disable it on versions of perl
# where there are problems with taint checking in the SelfLoader module.
#
AC_DEFINE_UNQUOTED(SELFLOADER_DATA, "$SELFLOADER_DATA")
#
# LEDA library path
#
......
......@@ -172,9 +172,8 @@ $TBOPSPID = "emulab-ops";
$EXPTLOGNAME = "activity.log";
$PROJROOT = "@PROJROOT_DIR@";
# _Always_ make sure that this 1 is at the end of the file...
1;
__DATA__
@SELFLOADER_DATA@
#
# Needs to be configured.
......@@ -649,4 +648,5 @@ sub TBMinTrust($$)
return $trust_value >= $minimum;
}
# _Always_ make sure that this 1 is at the end of the file...
1;
......@@ -338,7 +338,7 @@ sub Stringify($)
}
1;
__DATA__
@SELFLOADER_DATA@
sub dbrow($$) { return $_[0]->{'EXPT'}; }
sub locked($) { return $_[0]->expt_locked(); }
......@@ -4507,5 +4507,3 @@ sub ReserveSharedBandwidth($;$$)
# _Always_ make sure that this 1 is at the end of the file...
1;
......@@ -175,9 +175,8 @@ sub LocalExpLookup(@)
return Experiment->Lookup(@_);
}
# _Always_ make sure that this 1 is at the end of the file...
1;
__DATA__
@SELFLOADER_DATA@
#
# Create a fake object, as for the mapper (assign_wrapper) during debugging.
......@@ -2640,5 +2639,6 @@ sub IsOSLoaded($$)
return $query_result->numrows;
}
1;
# _Always_ make sure that this 1 is at the end of the file...
1;
......@@ -58,9 +58,8 @@ sub _checklossrate($)
return 1;
}
# _Always_ make sure that this 1 is at the end of the file...
1;
__DATA__
@SELFLOADER_DATA@
# Constants for checkslot code.
sub TBDB_CHECKDBSLOT_NOFLAGS() { 0x0; }
......@@ -462,4 +461,5 @@ sub ParRun($$$@)
return 0;
}
# _Always_ make sure that this 1 is at the end of the file...
1;
......@@ -101,9 +101,8 @@ sub TBdbfork()
sub hash_recurse2($%);
sub array_recurse2($%);
# _Always_ make sure that this 1 is at the end of the file...
1;
__DATA__
@SELFLOADER_DATA@
# Local lookup for a Node, to avoid dragging in the module.
sub LocalNodeLookup($)
......@@ -2632,5 +2631,6 @@ sub TBSetNodeHistory($$$$$)
}
return $node->SetNodeHistory($op, $this_user, $experiment);
}
1;
# _Always_ make sure that this 1 is at the end of the file...
1;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment