--- embedaddon/sudo/plugins/sudoers/redblack.c	2012/05/29 12:26:49	1.1.1.2
+++ embedaddon/sudo/plugins/sudoers/redblack.c	2013/07/22 10:46:12	1.1.1.3
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005, 2007, 2009-2011
+ * Copyright (c) 2004-2005, 2007, 2009-2013
  *	Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -43,7 +43,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -413,7 +412,7 @@ rbrepair(struct rbtree *tree, struct rbnode *node)
     struct rbnode *sibling;
     debug_decl(rbrepair, SUDO_DEBUG_RBTREE)
 
-    while (node->color == black && node != rbroot(tree)) {
+    while (node->color == black && node != rbfirst(tree)) {
 	if (node == node->parent->left) {
 	    sibling = node->parent->right;
 	    if (sibling->color == red) {
@@ -436,7 +435,7 @@ rbrepair(struct rbtree *tree, struct rbnode *node)
 		node->parent->color = black;
 		sibling->right->color = black;
 		rotate_left(tree, node->parent);
-		node = rbroot(tree); /* exit loop */
+		node = rbfirst(tree); /* exit loop */
 	    }
 	} else { /* if (node == node->parent->right) */
 	    sibling = node->parent->left;
@@ -460,7 +459,7 @@ rbrepair(struct rbtree *tree, struct rbnode *node)
 		node->parent->color = black;
 		sibling->left->color = black;
 		rotate_right(tree, node->parent);
-		node = rbroot(tree); /* exit loop */
+		node = rbfirst(tree); /* exit loop */
 	    }
 	}
     }