--- embedaddon/sudo/plugins/sudoers/defaults.h	2012/10/09 09:29:52	1.1.1.3
+++ embedaddon/sudo/plugins/sudoers/defaults.h	2014/06/15 16:12:54	1.1.1.5
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005, 2008-2010
+ * Copyright (c) 1999-2005, 2008-2013
  *	Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -19,20 +19,17 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _SUDO_DEFAULTS_H
-#define _SUDO_DEFAULTS_H
+#ifndef _SUDOERS_DEFAULTS_H
+#define _SUDOERS_DEFAULTS_H
 
 #include <def_data.h>
 
 struct list_member {
+    SLIST_ENTRY(list_member) entries;
     char *value;
-    struct list_member *next;
 };
 
-struct def_values {
-    char *sval;		/* string value */
-    int ival;		/* actually an enum */
-};
+SLIST_HEAD(list_members, list_member);
 
 enum list_ops {
     add,
@@ -40,6 +37,12 @@ enum list_ops {
     freeall
 };
 
+/* Mapping of tuple string value to enum def_tuple. */
+struct def_values {
+    char *sval;		/* string value */
+    enum def_tuple nval;/* numeric value */
+};
+
 /*
  * Structure describing compile-time and run-time options.
  */
@@ -52,11 +55,12 @@ struct sudo_defs_types {
     union {
 	int flag;
 	int ival;
+	unsigned int uival;
 	double fval;
 	enum def_tuple tuple;
 	char *str;
 	mode_t mode;
-	struct list_member *list;
+	struct list_members list;
     } sd_un;
 };
 
@@ -113,4 +117,4 @@ bool check_defaults(int what, bool quiet);
 
 extern struct sudo_defs_types sudo_defs_table[];
 
-#endif /* _SUDO_DEFAULTS_H */
+#endif /* _SUDOERS_DEFAULTS_H */