[Nmh-commits] nmh ./ChangeLog sbr/context_read.c

[Josh Bressers]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         
Changes by:     Josh Bressers <address@hidden>  05/12/14 01:48:24

Modified files:
        .              : ChangeLog 
        sbr            : context_read.c 

Log message:
        * Fedora Bug #163760: sbr/context_read.c (context_read): Ensure that the
        context is only read once.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.211&tr2=1.212&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/context_read.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.211 nmh/ChangeLog:1.212
--- nmh/ChangeLog:1.211 Mon Dec 12 20:26:53 2005
+++ nmh/ChangeLog       Wed Dec 14 01:48:24 2005
@@ -1,3 +1,8 @@
+2005-12-13  Michael Forrest <address@hidden>
+
+       * Fedora Bug #163760: sbr/context_read.c (context_read): Ensure that
+       the context is only read once.
+
 2005-12-12  Josh Bressers <address@hidden>
 
        * uip/sendsbr.c (annoaux): Fix the call to annotate() fixing a bug
Index: nmh/sbr/context_read.c
diff -u nmh/sbr/context_read.c:1.8 nmh/sbr/context_read.c:1.9
--- nmh/sbr/context_read.c:1.8  Sat Nov 19 16:04:25 2005
+++ nmh/sbr/context_read.c      Wed Dec 14 01:48:24 2005
@@ -1,7 +1,7 @@
 /*
  * context_read.c -- find and read profile and context files
  *
- * $Id: context_read.c,v 1.8 2005/11/19 16:04:25 pm215 Exp $
+ * $Id: context_read.c,v 1.9 2005/12/14 01:48:24 bress Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -39,6 +39,13 @@
     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.
      */