X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fsrc%2Frrd_fetch.c;h=bbb5314f3f87182a96b6f0c732bebff2c3211f12;hb=ad2c0b1adc29eda2ca2d57899ab16e7bbcc86392;hp=b46ba7a25bd2e36f3b3f42419978a18082f88fa0;hpb=6c63823d39516a91421db9750450c212ea38c5bb;p=rrdtool-all.git

diff --git a/program/src/rrd_fetch.c b/program/src/rrd_fetch.c
index b46ba7a2..bbb5314f 100644
--- a/program/src/rrd_fetch.c
+++ b/program/src/rrd_fetch.c
@@ -167,14 +167,17 @@ int rrd_fetch(
         return -1;
     }
 
-    status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
-    if (opt_daemon) free (opt_daemon);
-    if (status) return (-1);
-
     cf = argv[optind + 1];
 
-    status = rrd_fetch_r(argv[optind], cf, start, end, step,
-            ds_cnt, ds_namv, data);
+    rrdc_connect (opt_daemon);
+    if (rrdc_is_connected (opt_daemon))
+	    status = rrdc_fetch (argv[optind], cf, start, end, step,
+			    ds_cnt, ds_namv, data);
+
+    else
+	    status = rrd_fetch_r(argv[optind], cf, start, end, step,
+			    ds_cnt, ds_namv, data);
+
     if (status != 0)
         return (-1);
     return (0);
@@ -237,10 +240,8 @@ int rrd_fetch_fn(
 
 #ifdef HAVE_LIBDBI
     /* handle libdbi datasources */
-    if (strncmp("sql",filename,3)==0) {
-      if (filename[3]==filename[4]) {
+    if (strncmp("sql//",filename,5)==0) {
 	return rrd_fetch_fn_libdbi(filename,cf_idx,start,end,step,ds_cnt,ds_namv,data);
-      }
     }
 #endif