X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_read.c;h=32051c525134f331537485f130f371b1bf58a97a;hp=c3fe5995943e48bd0ec295bc0bebad862498653a;hb=1bb1f6c3f38b05060bf699ea2743f7386889bf63;hpb=9e43ae1d70f7da5d175425092395f9beb2d625d3

diff --git a/sbr/context_read.c b/sbr/context_read.c
index c3fe5995..32051c52 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -28,8 +28,6 @@
 #include <errno.h>				/* system call errors */
 #include <pwd.h>				/* structure for getpwuid() results */
 
-extern	int	errno;				/* system call error number */
-
 void
 context_read (void)
 {
@@ -40,6 +38,13 @@ context_read (void)
     register	struct	passwd	*pw;		/* getpwuid() results */
     register	FILE		*ib;		/* profile and context file pointer */
 
+    /*
+     *  If this routine _is_ called again (despite the wanings in the
+     *  comments above), return immediately.
+     */
+    if ( m_defs != 0 )
+        return;
+
     /*
      *	Find user's home directory.  Try the HOME environment variable first,
      *	the home directory field in the password file if that's not found.
@@ -122,6 +127,15 @@ context_read (void)
     if ((cp = getenv ("MHCONTEXT")) == (char *)0 || *cp == '\0')
 	cp = context;
 
+    /* context is NULL if context_foil() was called to disable use of context
+     * We also support users setting explicitly setting MHCONTEXT to /dev/null.
+     * (if this wasn't specialcased then the locking would be liable to fail)
+     */
+    if (!cp || (strcmp(cp,"/dev/null") == 0)) {
+	ctxpath = NULL;
+	return;
+    }
+    
     ctxpath = getcpy (m_maildir (cp));
 
     if ((ib = lkfopen (ctxpath, "r"))) {