diff -urN rrdtool-1.3.1.orig/src/rrd_tool.c rrdtool-1.3.1.patched/src/rrd_tool.c
--- rrdtool-1.3.1.orig/src/rrd_tool.c	2008-07-23 15:02:26.000000000 +0200
+++ rrdtool-1.3.1.patched/src/rrd_tool.c	2008-08-28 01:16:11.000000000 +0200
@@ -419,8 +419,7 @@
                    == 0) {
 
 #ifdef HAVE_CHROOT
-                chroot(argv[2]);
-                if (errno != 0) {
+                if (chroot(argv[2]) != 0) {
                     fprintf(stderr,
                             "ERROR: can't change root to '%s' errno=%d\n",
                             argv[2], errno);
@@ -439,8 +438,7 @@
             }
         }
         if (strcmp(firstdir, "")) {
-            chdir(firstdir);
-            if (errno != 0) {
+            if (chdir(firstdir) != 0) {
                 fprintf(stderr, "ERROR: %s\n", rrd_strerror(errno));
                 exit(errno);
             }