Removed the option to disable `~user' support (MHRC)

diff --git a/acconfig.h b/acconfig.h
index c8882cb40b0cfeeef80ae5dff08a9a77fb5f3d09..f3d9ca340383223e6463979f54ffdfdb08e84971 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -69,11 +69,6 @@
  */
 #define SLOCAL_MBOX  1
 
-/*
- * If this is defined, nmh will recognize the ~ construct.
- */
-#define MHRC    1
-
 /*
  * Compile simple ftp client into mhshow/mhstore.  This will be used by
  * mhshow/mhstore for ftp access unless you have specified another access

diff --git a/config/config.c b/config/config.c
index cc1212849dad1c1c7edd9d27dc54f7d423f77bb3..245ecdeafa0daf08aa497e8b1ca192ad083589e9 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -7,10 +7,7 @@
 */
 
 #include <h/mh.h>
-
-#ifdef MHRC
-# include <pwd.h>
-#endif
+#include <pwd.h>
 
 
 /*
@@ -28,7 +25,6 @@ etcpath (char *file)
 {
        static char epath[PATH_MAX];
        char *cp;
-#ifdef MHRC
        char *pp;
        struct passwd *pw;
 
@@ -56,9 +52,8 @@ etcpath (char *file)
                if (access (epath, R_OK) != NOTOK)
                        return epath;  /* else fall */
        }
-try_it:
-#endif /* MHRC */
 
+try_it:
        if (*file == '/') {
                /* If already absolute pathname, return it */
                return file;