Browse Source

Forward XAUTHORITY variable to the plugin environment - this fixes a plugin issue in some cases on Unix

rdb 16 years ago
parent
commit
97982327f1
2 changed files with 3 additions and 3 deletions
  1. 1 1
      direct/src/plugin/p3dAuthSession.cxx
  2. 2 2
      direct/src/plugin/p3dSession.cxx

+ 1 - 1
direct/src/plugin/p3dAuthSession.cxx

@@ -186,7 +186,7 @@ start_p3dcert() {
     "SYSTEMROOT", "USERPROFILE", "COMSPEC",
     "SYSTEMROOT", "USERPROFILE", "COMSPEC",
 #endif
 #endif
 #ifdef HAVE_X11
 #ifdef HAVE_X11
-    "DISPLAY",
+    "DISPLAY", "XAUTHORITY",
 #endif
 #endif
     NULL
     NULL
   };
   };

+ 2 - 2
direct/src/plugin/p3dSession.cxx

@@ -863,7 +863,7 @@ start_p3dpython(P3DInstance *inst) {
       "SYSTEMROOT", "USERPROFILE", "COMSPEC",
       "SYSTEMROOT", "USERPROFILE", "COMSPEC",
 #endif
 #endif
 #ifdef HAVE_X11
 #ifdef HAVE_X11
-      "DISPLAY",
+      "DISPLAY", "XAUTHORITY",
 #endif
 #endif
       NULL
       NULL
     };
     };
@@ -956,7 +956,7 @@ start_p3dpython(P3DInstance *inst) {
   _env += "TEMP=";
   _env += "TEMP=";
   _env += inst_mgr->get_temp_directory();
   _env += inst_mgr->get_temp_directory();
   _env += '\0';
   _env += '\0';
-    
+  
   // Define each package's root directory in an environment variable
   // Define each package's root directory in an environment variable
   // named after the package, for the convenience of the packages in
   // named after the package, for the convenience of the packages in
   // setting up their config files.
   // setting up their config files.