* Fedora Bug #163760: sbr/context_read.c (context_read): Ensure that the

context is only read once.

diff --git a/ChangeLog b/ChangeLog
index bcea34a39377b86752e611484087e98e7188c12d..3ade10b81dec5a04baa1e24356c2c027bbd5dcca 100644 (file)
--- 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 6a1eea1259cfbaa94ac75a41232ff8abb3387525..32051c525134f331537485f130f371b1bf58a97a 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -38,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.