From 647df8cfe70a667f011b38a058244528c4a22a40 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Wed, 5 Jan 2011 22:33:03 -0800 Subject: Make sure old rc_sys code never runs if the rc_sys variable exists. Signed-off-by: Robin H. Johnson --- src/librc/librc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/librc/librc.c b/src/librc/librc.c index 868accd7..8a9fd796 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -290,9 +290,11 @@ librc_hidden_def(rc_sys_v1) const char * rc_sys(void) { - const char *s = rc_sys_v2(); - if(s) return s; - return rc_sys_v1(); + if(rc_conf_value("rc_sys")) { + return rc_sys_v2(); + } else { + return rc_sys_v1(); + } } librc_hidden_def(rc_sys) -- cgit v1.2.3