Browse Source

looking good

David Rose 16 years ago
parent
commit
c194dfa3c3

+ 0 - 1
direct/src/p3d/panda3d.pdef

@@ -71,7 +71,6 @@ class p3dcert(package):
     cvar = ConfigVariableFilename('ca-bundle-filename')
     filename = Filename(cvar.getValue())
     if not filename.empty():
-        print filename
         file(filename, newName = 'ca-bundle.crt', extract = True)
         
 

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

@@ -265,7 +265,7 @@ wt_thread_run() {
   nout << "p3dcert process has successfully stopped.\n";
 #else
   int status;
-  pid_t result = waitpid(_p3dcert_pid, &status, WNOHANG);
+  pid_t result = waitpid(_p3dcert_pid, &status, 0);
   if (result == -1) {
     perror("waitpid");
   }

+ 2 - 4
direct/src/plugin/p3dInstance.cxx

@@ -1034,10 +1034,8 @@ check_p3d_signature() {
     return true;
   }
 
-  // Temporary hack: disabling further security checks until this code
-  // is complete.
-  return true;
-
+  // See if we've previously approved the certificate--any
+  // certificate--that's signing this p3d file.
   int num_signatures = _mf_reader.get_num_signatures();
   for (int i = 0; i < num_signatures; ++i) {
     const P3DMultifileReader::CertChain &chain = _mf_reader.get_signature(i);