X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1e0b1d40a6285c532b722f4584fa7ddde220deff..9cca3d060843239d619fa41168cb6342d6ac5461:/config/config.c

diff --git a/config/config.c b/config/config.c
index 5c0591ca..020d610d 100644
--- a/config/config.c
+++ b/config/config.c
@@ -11,8 +11,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
 
 
 /*
@@ -71,9 +72,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 +105,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 +147,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
@@ -242,13 +246,6 @@ char *moreproc = NULL;
 
 char *mhlproc = nmhlibexecdir (/mhl);
 
-/* 
- * This is the super handy BBoard reading program, which is
- * really just the nmh shell program.
- */
-
-char *mshproc = nmhbindir (/msh);
-
 /* 
  * This program is called to pack a folder.  
  */
@@ -299,13 +296,6 @@ char *showmimeproc = nmhbindir (/mhshow);
 
 char *showproc = nmhlibexecdir (/mhl);
 
-/* 
- * This program is called by vmh as the back-end to the window management
- * protocol
- */
-
-char *vmhproc = nmhbindir (/msh);
-
 /* 
  * This program is called after comp, et. al., have built a draft
  */