Abort disabling old PEM keys on I/O errors.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index da58a45..c5467d2 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,8 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2010 Julien Muchembled <jm@jmuchemb.eu>
                  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
@@ -458,24 +459,33 @@ bool disable_old_keys(FILE *f) {
        rewind(f);
        pos = ftell(f);
 
+       if(pos < 0)
+               return false;
+
        while(fgets(buf, sizeof buf, f)) {
                if(!strncmp(buf, "-----BEGIN RSA", 14)) {       
                        buf[11] = 'O';
                        buf[12] = 'L';
                        buf[13] = 'D';
-                       fseek(f, pos, SEEK_SET);
-                       fputs(buf, f);
+                       if(fseek(f, pos, SEEK_SET))
+                               break;
+                       if(fputs(buf, f) <= 0)
+                               break;
                        disabled = true;
                }
                else if(!strncmp(buf, "-----END RSA", 12)) {    
                        buf[ 9] = 'O';
                        buf[10] = 'L';
                        buf[11] = 'D';
-                       fseek(f, pos, SEEK_SET);
-                       fputs(buf, f);
+                       if(fseek(f, pos, SEEK_SET))
+                               break;
+                       if(fputs(buf, f) <= 0)
+                               break;
                        disabled = true;
                }
                pos = ftell(f);
+               if(pos < 0)
+                       break;
        }
 
        return disabled;