diff -r -u papillon-0.5.3/CHANGES papillon-0.5.4/CHANGES
--- papillon-0.5.3/CHANGES	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/CHANGES	Wed Aug 30 23:33:43 2006
@@ -1,3 +1,5 @@
+0.5.4
+
 0.5.3   o  Casper Dik noted that bug 1170077 isn't a bug anymore
         o  Fixed a security problem with copyinstr() calls
         o  Added rudimentary support for a setuid execution protection
Common subdirectories: papillon-0.5.3/doc and papillon-0.5.4/doc
Common subdirectories: papillon-0.5.3/src and papillon-0.5.4/src
Common subdirectories: papillon-0.5.3/test and papillon-0.5.4/test
diff -r -u papillon-0.5.3/src/chroot.c papillon-0.5.4/src/chroot.c
--- papillon-0.5.3/src/chroot.c	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/chroot.c	Wed Aug 30 23:28:24 2006
@@ -72,7 +72,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied recursive chroot in %s", k_path);
 	ret = set_errno(EPERM);
     } else {
@@ -109,7 +109,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied mounting %s chroot'ed", k_path);
 	ret = set_errno(EPERM);
     } else {
@@ -146,7 +146,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied creating device node %s chroot'ed", k_path);
 	ret = set_errno(EPERM);
     } else {
@@ -192,7 +192,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied loading module %s chroot'ed", k_path);
 	ret = set_errno(EPERM);
     } else {
@@ -229,7 +229,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied setting setuid bit on %s chroot'ed",
 		k_path);
 	ret = set_errno(EPERM);
@@ -267,7 +267,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied creating device node %s chroot'ed", k_path);
 	ret = set_errno(EPERM);
     } else {
@@ -307,7 +307,7 @@
     if (ret != 0)
 	goto skip;
 
-    if (config.chrootprot == DENY) {
+    if (config.chrootprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied creating device node %s chroot'ed", k_path);
 	ret = set_errno(EPERM);
     } else {
diff -r -u papillon-0.5.3/src/gcc-sane papillon-0.5.4/src/gcc-sane
--- papillon-0.5.3/src/gcc-sane	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/gcc-sane	Wed Aug 30 23:23:10 2006
@@ -30,14 +30,14 @@
 GCC_REL=`$GCC -v 2>&1 | head -1 | awk '{print $4}'`
 GCC_VER=`gcc --version | head -1`
 
-if [ -n "`echo $GCC_REL | grep $SOL_REL`" ] ; then
-   echo " * Info: gcc release valid for $SOL_REL"
-else
-   echo " * Error: gcc release invalid for $SOL_REL."
-   echo "          $GCC_REL"
-   echo "          gcc release for $SOL_REL required."
-   exit 1
-fi
+#if [ -n "`echo $GCC_REL | grep $SOL_REL`" ] ; then
+#   echo " * Info: gcc release valid for $SOL_REL"
+#else
+#   echo " * Error: gcc release invalid for $SOL_REL."
+#   echo "          $GCC_REL"
+#   echo "          gcc release for $SOL_REL required."
+#   exit 1
+#fi
 
 if [ -n "`echo $GCC_VER | grep ' 3\.'`" -o \
      -n "`echo $GCC_VER | grep '^3\.'`" ] ; then
diff -r -u papillon-0.5.3/src/headers.h papillon-0.5.4/src/headers.h
--- papillon-0.5.3/src/headers.h	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/headers.h	Wed Aug 30 23:27:01 2006
@@ -69,6 +69,8 @@
 #include <sys/proc/prdata.h>
 #endif
 #include <sys/dlpi.h>
+#include <sys/cred.h>
+#include <sys/cred_impl.h>
 
 /* 
  * GCC 2.x and 3.0 may need this. But I told you to use newer GCC versions!
diff -r -u papillon-0.5.3/src/papctl.c papillon-0.5.4/src/papctl.c
--- papillon-0.5.3/src/papctl.c	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/papctl.c	Wed Aug 30 23:28:42 2006
@@ -204,11 +204,11 @@
     value = variable + 2;
 
     if (!strcmp(value, "none"))
-	return NONE;
+	return PAP_NONE;
     else if (!strcmp(value, "warn"))
-	return WARN;
+	return PAP_WARN;
     else if (!strcmp(value, "deny"))
-	return DENY;
+	return PAP_DENY;
     else {
 	printf("Variable: %s\n", variable);
 	print_error(INVALID_VALUE);
diff -r -u papillon-0.5.3/src/papctl.h papillon-0.5.4/src/papctl.h
--- papillon-0.5.3/src/papctl.h	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/papctl.h	Wed Aug 30 23:29:29 2006
@@ -40,7 +40,7 @@
  * Avoid working with too complex macros. Erhmm.
  */
 #define F(X) (X==ON)?"on":"off"
-#define P(X) (X==NONE)?"none":(X==WARN)?"warn":"deny"
+#define P(X) (X==PAP_NONE)?"none":(X==PAP_WARN)?"warn":"deny"
 
 /*
  * Possible error values.
diff -r -u papillon-0.5.3/src/papillon.c papillon-0.5.4/src/papillon.c
--- papillon-0.5.3/src/papillon.c	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/papillon.c	Wed Aug 30 23:24:19 2006
@@ -49,7 +49,7 @@
     /* rstproc, ppromisc, modhiding, secstdfd */
     ON, ON, OFF, ON,
     /* fifoprot, symprot, hardprot, chrootprot, sexecprot */
-    DENY, DENY, DENY, DENY, DENY
+    PAP_DENY, PAP_DENY, PAP_DENY, PAP_DENY, PAP_DENY
 };
 
 /*
diff -r -u papillon-0.5.3/src/papillon.h papillon-0.5.4/src/papillon.h
--- papillon-0.5.3/src/papillon.h	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/papillon.h	Wed Aug 30 23:23:59 2006
@@ -62,7 +62,7 @@
  * Configuration structure
  */
 enum feature { OFF = 0, ON };
-enum protection { NONE = 0, WARN, DENY };
+enum protection { PAP_NONE = 0, PAP_WARN, PAP_DENY };
 
 typedef struct pap_config {
     enum feature rstproc;
diff -r -u papillon-0.5.3/src/setuid.c papillon-0.5.4/src/setuid.c
--- papillon-0.5.3/src/setuid.c	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/setuid.c	Wed Aug 30 23:27:50 2006
@@ -136,7 +136,7 @@
        if(!strcmp(pap_whitelist[i], k_comm))
           goto next;
           
-    if (config.sexecprot == DENY) {
+    if (config.sexecprot == PAP_DENY) {
 	log_msg(CE_WARN, "Denied executing %s by setuid parent %s", k_path,
 		k_comm);
 	ret = set_errno(EPERM);
diff -r -u papillon-0.5.3/src/stckbt.c papillon-0.5.4/src/stckbt.c
--- papillon-0.5.3/src/stckbt.c	Mon Sep  8 20:31:38 2003
+++ papillon-0.5.4/src/stckbt.c	Wed Aug 30 23:27:32 2006
@@ -89,7 +89,7 @@
 	if (copyinstr(path, k_path, MAX_PATH_LEN, (size_t *) & len) != 0) 
 	    goto err_and_release;
 
-	if (config.fifoprot == DENY) {
+	if (config.fifoprot == PAP_DENY) {
 	    log_msg(CE_WARN, "Denied opening FIFO %s", k_path);
 	    ret = B_FALSE;
 	} else {
@@ -110,7 +110,7 @@
 	if (copyinstr(path, k_path, MAX_PATH_LEN, (size_t *) & len) != 0)
 	    goto err_and_release;
 
-	if (config.symprot == DENY) {
+	if (config.symprot == PAP_DENY) {
 	    log_msg(CE_WARN, "Denied following symlink %s", k_path);
 	    ret = B_FALSE;
 	} else {
@@ -243,7 +243,7 @@
 	    goto err_and_release;
 #endif
 
-	if (config.hardprot == DENY) {
+	if (config.hardprot == PAP_DENY) {
 #ifdef SOLARIS8
 	    log_msg(CE_WARN, "Denied creating hardlink");
 #else