- Corrected some situations where variables might be used without being

initialized. [ISC-Bugs #16865]

- Silenced several other compiler warnings. [ISC-Bugs #16865]

- Include the more standard sys/uio.h rather than rely upon other header
  files to include it (fixes a BSDI compile failure). [ISC-Bugs #16865]

common/execute.c

@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: execute.c,v 1.49 2007/01/28 23:00:19 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: execute.c,v 1.50 2007/05/11 15:50:18 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -796,7 +796,7 @@ void write_statements (file, statements, indent)
 			indent_spaces (file, indent);
 			fprintf (file, "}");
 			break;
-			
+
 		      case case_statement:
 			indent_spaces (file, indent - 1);
 			fprintf (file, "case ");
@@ -806,7 +806,7 @@ void write_statements (file, statements, indent)
 			token_print_indent (file, col, indent + 5,
 					    "", "", ":");
 			break;
-			
+
 		      case default_statement:
 			indent_spaces (file, indent - 1);
 			fprintf (file, "default: ");
@@ -975,8 +975,8 @@ void write_statements (file, statements, indent)
                       case execute_statement:
 #ifdef ENABLE_EXECUTE
                         indent_spaces (file, indent);
-			col = token_print_indent(file, col, indent + 4, "", "",
-						 "execute");
+			col = token_print_indent(file, indent + 4, indent + 4,
+						 "", "", "execute");
 			col = token_print_indent(file, col, indent + 4, " ", "",
 						 "(");
                         col = token_print_indent(file, col, indent + 4, "\"", "\"", r->data.execute.command);