mailnamefile: fix parsing

Fix a file descriptor leak in the MAILNAMEFILE code.
Fix a mistake in my patch submitted to DFBSD - "initialized" should be static!

diff --git a/util.c b/util.c
index 8808d02ee30d3e46a81f4c14d921f6bd8d98f093..e6d43e9928fea86b3db12ef67cc1ab9e4b839cb2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -49,8 +49,9 @@ const char *
 hostname(void)
 {
        static char name[MAXHOSTNAMELEN+1];
-       int initialized = 0;
+       static int initialized = 0;
        FILE *fp;
+       char *res;
        size_t len;
 
        if (initialized)
@@ -64,7 +65,9 @@ hostname(void)
        if (config.mailnamefile != NULL && config.mailnamefile[0] != '\0') {
                fp = fopen(config.mailnamefile, "r");
                if (fp != NULL) {
-                       if (fgets(name, sizeof(name), fp) != NULL) {
+                       res = fgets(name, sizeof(name), fp);
+                       fclose(fp);
+                       if (res != NULL) {
                                len = strlen(name);
                                while (len > 0 &&
                                    (name[len - 1] == '\r' ||
@@ -75,7 +78,6 @@ hostname(void)
                                        return (name);
                                }
                        }
-                       fclose(fp);
                }
        }
        if (gethostname(name, sizeof(name)) != 0)