X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/012d05c2b62332eb400d66b806e48216d39358c6..28bf8af2f50b353b5702b8c9214d4106f998c638:/config/config.c

diff --git a/config/config.c b/config/config.c
index 919c1eec..7d9f2633 100644
--- a/config/config.c
+++ b/config/config.c
@@ -1,6 +1,4 @@
-
-/*
- * config.c -- master nmh configuration file
+/* config.c -- master nmh configuration file
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,8 +9,9 @@
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file
-#define nmhetcdir(file) NMHETCDIR#file
 #define nmhlibexecdir(file) NMHLIBEXECDIR#file
+#define nmhetcdir(file) NMHETCDIR#file
+#define nmhdocdir(file) NMHDOCDIR#file
 
 
 /*
@@ -62,7 +61,8 @@ etcpath (char *file)
 		*--cp = '/';
 
 	    if (access (epath, R_OK) != NOTOK)
-		return epath;	/* else fall */
+		return epath;
+		/* FALLTHRU */
 try_it:
 
 	default: 
@@ -71,9 +71,8 @@ try_it:
 		/* Will leak because caller doesn't know cp was
 		   dynamically allocated. */
 		return cp;
-	    } else {
-		free (cp);
 	    }
+            free (cp);
     }
 
     /* Check nmh `etc' directory */
@@ -105,6 +104,9 @@ char *mh_profile = ".mh_profile";
 /* name of credentials file, defaults to .netrc in either Path or $HOME. */
 char *credentials_file;
 
+/* if set to 1, do not check permissions on credentials file */
+int credentials_no_perm_check = 0;
+
 /* name of current message "sequence" */
 char *current = "cur";
 
@@ -144,8 +146,9 @@ char *nmhaccessftp = "nmh-access-ftp";
 char *nmhaccessurl = "nmh-access-url";
 
 char *mhbindir = NMHBINDIR;
-char *mhetcdir = NMHETCDIR;
 char *mhlibexecdir = NMHLIBEXECDIR;
+char *mhetcdir = NMHETCDIR;
+char *mhdocdir = NMHDOCDIR;
 
 /* 
  * nmh not-so constants
@@ -328,4 +331,3 @@ char *foldprot = "700";
  */
 
 char *msgprot = "600";
-