From: Josh Bressers <josh@bress.net>
Date: Wed, 14 Dec 2005 01:48:24 +0000 (+0000)
Subject: * Fedora Bug #163760: sbr/context_read.c (context_read): Ensure that the
X-Git-Tag: RELEASE_1_2~3
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=221548ea735d938b83f081a654ba93fbb0de747a

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

diff --git a/ChangeLog b/ChangeLog
index bcea34a..3ade10b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-13  Michael Forrest <mef@computer.org>
+
+	* Fedora Bug #163760: sbr/context_read.c (context_read): Ensure that
+	the context is only read once.
+
 2005-12-12  Josh Bressers <josh@bress.net>
 
 	* uip/sendsbr.c (annoaux): Fix the call to annotate() fixing a bug
diff --git a/sbr/context_read.c b/sbr/context_read.c
index 6a1eea1..32051c5 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -39,6 +39,13 @@ context_read (void)
     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.
      */