automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9879 65c4cc65-6c06-0410-ace0-fbb531ad65f3

asterisk.c

@@ -2210,7 +2210,7 @@ int main(int argc, char *argv[])
 
 #endif /* __CYGWIN__ */
 
-	if (geteuid() && ast_opt_dump_core) {
+	if (geteuid() && option_dumpcore) {
 		if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) {
 			ast_log(LOG_WARNING, "Unable to set the process for core dumps after changing to a non-root user. %s\n", strerror(errno));
 		}