From c194dfa3c379b4f4c5d123820395485c76aa767a Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 17 Sep 2009 23:03:11 +0000
Subject: [PATCH] looking good

---
 direct/src/p3d/panda3d.pdef          | 1 -
 direct/src/plugin/p3dAuthSession.cxx | 2 +-
 direct/src/plugin/p3dInstance.cxx    | 6 ++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index 7b91581531..88d36e0c52 100755
--- a/direct/src/p3d/panda3d.pdef
+++ b/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)
         
 
diff --git a/direct/src/plugin/p3dAuthSession.cxx b/direct/src/plugin/p3dAuthSession.cxx
index 10369450ac..b12039cb3a 100644
--- a/direct/src/plugin/p3dAuthSession.cxx
+++ b/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");
   }
diff --git a/direct/src/plugin/p3dInstance.cxx b/direct/src/plugin/p3dInstance.cxx
index 62751e3400..516fbbaada 100644
--- a/direct/src/plugin/p3dInstance.cxx
+++ b/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);