diff -rc -C 2 ../standard/dhcp-2.0pl5/common/options.c ./dhcp-2.0pl5/common/options.c
*** ../standard/dhcp-2.0pl5/common/options.c	Thu May  6 14:54:34 1999
--- ./dhcp-2.0pl5/common/options.c	Sun Oct  3 03:59:32 1999
***************
*** 193,196 ****
--- 193,210 ----
  				 [DHO_DHCP_MAX_MESSAGE_SIZE].data);
  
+ 	/* Begin Add by ME */
+ 	/* Added for Mac NC to increase max packet size for return */
+ 	/* Check to see if above set mms for future if Apple decides */
+ 	/* To use industry standards to notify dhcpd of max packet size */
+ 	/* Does anyone what the real max is for NetBooting Macs?  */
+ 	/* I know it is bad to make a guess and make it bigger than it */
+ 	/*  should be but it works for now. If anyone knows it, let me know! */
+ 	if (!mms &&
+ 	    inpacket &&
+ 	    inpacket -> options [DHO_MAC_NC_CLIENT_ID].data &&
+ 	    (strcmp (inpacket -> options [DHO_MAC_NC_CLIENT_ID].data, "Apple Mac NC")))
+ 		mms = 576;
+ 	/* End Add by ME */
+ 
  	/* If the client has provided a maximum DHCP message size,
  	   use that; otherwise, if it's BOOTP, only 64 bytes; otherwise
***************
*** 207,210 ****
--- 221,228 ----
  	if (main_buffer_size > sizeof buffer)
  		main_buffer_size = sizeof buffer;
+ 
+ 	/* Begin Add by ME */
+ 	debug ("MacNC: Final value of main_buffer_size: %d", main_buffer_size);
+ 	/* End Add by ME */
  
  	/* Preload the option priority list with mandatory options. */
diff -rc -C 2 ../standard/dhcp-2.0pl5/common/tables.c ./dhcp-2.0pl5/common/tables.c
*** ../standard/dhcp-2.0pl5/common/tables.c	Sat Apr 24 09:46:44 1999
--- ./dhcp-2.0pl5/common/tables.c	Sun Oct  3 03:59:22 1999
***************
*** 287,292 ****
  	{ "option-218", "X",				&dhcp_universe, 218 },
  	{ "option-219", "X",				&dhcp_universe, 219 },
! 	{ "option-220", "X",				&dhcp_universe, 220 },
! 	{ "option-221", "X",				&dhcp_universe, 221 },
  	{ "option-222", "X",				&dhcp_universe, 222 },
  	{ "option-223", "X",				&dhcp_universe, 223 },
--- 287,296 ----
  	{ "option-218", "X",				&dhcp_universe, 218 },
  	{ "option-219", "X",				&dhcp_universe, 219 },
! /* Begin Mod by ME */
! /*{ "option-220", "X",				&dhcp_universe, 220 },*/
! 	{ "mac-nc-client-unknown", "X",			&dhcp_universe, 220 },
! /*{ "option-221", "X",				&dhcp_universe, 221 },*/
! 	{ "mac-nc-client-id", "t",			&dhcp_universe, 221 },
! /* End Mod by ME */
  	{ "option-222", "X",				&dhcp_universe, 222 },
  	{ "option-223", "X",				&dhcp_universe, 223 },
***************
*** 297,309 ****
  	{ "option-228", "X",				&dhcp_universe, 228 },
  	{ "option-229", "X",				&dhcp_universe, 229 },
! 	{ "option-230", "X",				&dhcp_universe, 230 },
  	{ "option-231", "X",				&dhcp_universe, 231 },
! 	{ "option-232", "X",				&dhcp_universe, 232 },
! 	{ "option-233", "X",				&dhcp_universe, 233 },
! 	{ "option-234", "X",				&dhcp_universe, 234 },
! 	{ "option-235", "X",				&dhcp_universe, 235 },
  	{ "option-236", "X",				&dhcp_universe, 236 },
! 	{ "option-237", "X",				&dhcp_universe, 237 },
! 	{ "option-238", "X",				&dhcp_universe, 238 },
  	{ "option-239", "X",				&dhcp_universe, 239 },
  	{ "option-240", "X",				&dhcp_universe, 240 },
--- 301,326 ----
  	{ "option-228", "X",				&dhcp_universe, 228 },
  	{ "option-229", "X",				&dhcp_universe, 229 },
! /* Begin Mod by ME */
! /*{ "option-230", "X",				&dhcp_universe, 230 },*/
! 	{ "mac-nc-server-version", "X",			&dhcp_universe, 230 },
! /* End Mod by ME */
  	{ "option-231", "X",				&dhcp_universe, 231 },
! /* Begin Mod by ME */
! /*{ "option-232", "X",				&dhcp_universe, 232 },*/
! 	{ "mac-nc-server-user-name", "t",		&dhcp_universe, 232 },
! /*{ "option-233", "X",				&dhcp_universe, 233 },*/
! 	{ "mac-nc-server-password", "t",		&dhcp_universe, 233 },
! /*{ "option-234", "X",				&dhcp_universe, 234 },*/
! 	{ "mac-nc-server-nb-img", "X",			&dhcp_universe, 234 },
! /*{ "option-235", "X",				&dhcp_universe, 235 },*/
! 	{ "mac-nc-server-apps-img", "X",		&dhcp_universe, 235 },
! /* End Mod by ME */
  	{ "option-236", "X",				&dhcp_universe, 236 },
! /* Begin Mod by ME */
! /*{ "option-237", "X",				&dhcp_universe, 237 },*/
! 	{ "mac-nc-server-machine-name", "t",		&dhcp_universe, 237 },
! /*{ "option-238", "X",				&dhcp_universe, 238 },*/
! 	{ "mac-nc-server-client-nb-img", "X",		&dhcp_universe, 238 },
! /* End Mod by ME */
  	{ "option-239", "X",				&dhcp_universe, 239 },
  	{ "option-240", "X",				&dhcp_universe, 240 },
***************
*** 386,391 ****
--- 403,422 ----
  	DHO_X_DISPLAY_MANAGER,
  	DHO_DHCP_PARAMETER_REQUEST_LIST,
+ 	/* Begin Mod by ME */
+ 	DHO_MAC_NC_CLIENT_UNKNOWN,
+ 	DHO_MAC_NC_CLIENT_ID,
+ 	DHO_MAC_NC_SERVER_VERSION,
+ 	DHO_MAC_NC_SERVER_USER_NAME,
+ 	DHO_MAC_NC_SERVER_PASSWORD,
+ 	DHO_MAC_NC_SERVER_NB_IMG,
+ 	DHO_MAC_NC_SERVER_APPS_IMG,
+ 	DHO_MAC_NC_SERVER_MACHINE_NAME,
+ 	DHO_MAC_NC_SERVER_CLIENT_NB_IMG,
+ 	/* End Mod by ME */
+ 
  
  	/* Presently-undefined options... */
+         /* ME: considered removal 220,221,230,232,233,234,235,237,238 */
+         /*     from this list: */
  	62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
  	78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
diff -rc -C 2 ../standard/dhcp-2.0pl5/includes/dhcp.h ./dhcp-2.0pl5/includes/dhcp.h
*** ../standard/dhcp-2.0pl5/includes/dhcp.h	Tue Dec 22 14:46:17 1998
--- ./dhcp-2.0pl5/includes/dhcp.h	Sun Oct  3 03:59:22 1999
***************
*** 156,159 ****
--- 156,170 ----
  #define DHO_DHCP_CLIENT_IDENTIFIER	61
  #define DHO_DHCP_USER_CLASS_ID		77
+ /* Begin Add by ME */
+ #define DHO_MAC_NC_CLIENT_UNKNOWN	220
+ #define DHO_MAC_NC_CLIENT_ID		221
+ #define DHO_MAC_NC_SERVER_VERSION	230
+ #define DHO_MAC_NC_SERVER_USER_NAME	232
+ #define DHO_MAC_NC_SERVER_PASSWORD	233
+ #define DHO_MAC_NC_SERVER_NB_IMG	234
+ #define DHO_MAC_NC_SERVER_APPS_IMG	235
+ #define DHO_MAC_NC_SERVER_MACHINE_NAME	237
+ #define DHO_MAC_NC_SERVER_CLIENT_NB_IMG	238
+ /* End Add by ME */
  #define DHO_END				255