ip/dhcpd: remove undocumented dhcpgroup mechanism, group related ndb attributes together

3 files changed, 26 insertions, 32 deletions

diff --git a/sys/src/cmd/ip/dhcpd/dat.h b/sys/src/cmd/ip/dhcpd/dat.h
index f2e64c729..4ede21087 100644
--- a/sys/src/cmd/ip/dhcpd/dat.h
+++ b/sys/src/cmd/ip/dhcpd/dat.h
@@ -44,7 +44,6 @@ struct Info
 	uchar	auip[NDB_IPlen];	/* authentication server ip address */
 	uchar   rootserverip[NDB_IPlen];  /* ip addr of root nfs server  */
 	char	rootpath[Maxstr];	/* rootfs for diskless nfs clients */
-	char	dhcpgroup[Maxstr];
 	char	vendor[Maxstr];		/* vendor info */
 };
 
diff --git a/sys/src/cmd/ip/dhcpd/dhcpd.c b/sys/src/cmd/ip/dhcpd/dhcpd.c
index d71fdd897..ee2a7ebaf 100644
--- a/sys/src/cmd/ip/dhcpd/dhcpd.c
+++ b/sys/src/cmd/ip/dhcpd/dhcpd.c
@@ -402,7 +402,7 @@ proto(Req *rp, int n)
 
 	/* info about target system */
 	if(lookup(rp->bp, &rp->ii, &rp->gii) == 0)
-		if(rp->ii.indb && rp->ii.dhcpgroup[0] == 0)
+		if(rp->ii.indb)
 			rp->staticbinding = 1;
 
 	if(rp->dhcptype)
diff --git a/sys/src/cmd/ip/dhcpd/ndb.c b/sys/src/cmd/ip/dhcpd/ndb.c
index 0aea361cf..3fad9cb4d 100644
--- a/sys/src/cmd/ip/dhcpd/ndb.c
+++ b/sys/src/cmd/ip/dhcpd/ndb.c
@@ -110,17 +110,16 @@ lookupip(uchar *ipaddr, char *hwattr, char *hwval, Info *iip, int gate)
 	*p++ = "ipmask";
 	*p++ = "@ipgw";
 	if(!gate){
+		*p++ = "dom";
 		*p++ = "bootf";
 		*p++ = "bootf2";
 		*p++ = "@tftp";
 		*p++ = "@tftp2";
-		*p++ = "rootpath";
-		*p++ = "dhcp";
-		*p++ = "vendor";
-		*p++ = "dom";
 		*p++ = "@fs";
 		*p++ = "@auth";
+		*p++ = "rootpath";
 		*p++ = "@rootserver";
+		*p++ = "vendor";
 	}
 	if(hwattr != nil)
 		*p++ = hwattr;
@@ -139,27 +138,12 @@ lookupip(uchar *ipaddr, char *hwattr, char *hwval, Info *iip, int gate)
 		if(strcmp(nt->attr, "ipmask") == 0)
 			setipmask(iip->ipmask, nt->val);
 		else
-		if(strcmp(nt->attr, "fs") == 0)
-			setipaddr(iip->fsip, nt->val);
-		else
-		if(strcmp(nt->attr, "auth") == 0)
-			setipaddr(iip->auip, nt->val);
-		else
-		if(strcmp(nt->attr, "tftp") == 0)
-			setipaddr(iip->tftp, nt->val);
-		else
-		if(strcmp(nt->attr, "tftp2") == 0)
-			setipaddr(iip->tftp2, nt->val);
-		else
 		if(strcmp(nt->attr, "ipgw") == 0)
 			setipaddr(iip->gwip, nt->val);
 		else
-		if(strcmp(nt->attr, "rootserver") == 0)
-			setipaddr(iip->rootserverip, nt->val);
-		else
-		if(strcmp(nt->attr, "dhcp") == 0){
-			if(iip->dhcpgroup[0] == 0)
-				strncpy(iip->dhcpgroup, nt->val, sizeof(iip->dhcpgroup)-1);
+		if(strcmp(nt->attr, "dom") == 0){
+			if(iip->domain[0] == 0)
+				strncpy(iip->domain, nt->val, sizeof(iip->domain)-1);
 		}
 		else
 		if(strcmp(nt->attr, "bootf") == 0){
@@ -172,20 +156,31 @@ lookupip(uchar *ipaddr, char *hwattr, char *hwval, Info *iip, int gate)
 				strncpy(iip->bootf2, nt->val, sizeof(iip->bootf2)-1);
 		}
 		else
-		if(strcmp(nt->attr, "vendor") == 0){
-			if(iip->vendor[0] == 0)
-				strncpy(iip->vendor, nt->val, sizeof(iip->vendor)-1);
-		}
+		if(strcmp(nt->attr, "tftp") == 0)
+			setipaddr(iip->tftp, nt->val);
 		else
-		if(strcmp(nt->attr, "dom") == 0){
-			if(iip->domain[0] == 0)
-				strncpy(iip->domain, nt->val, sizeof(iip->domain)-1);
-		}
+		if(strcmp(nt->attr, "tftp2") == 0)
+			setipaddr(iip->tftp2, nt->val);
+		else
+		if(strcmp(nt->attr, "fs") == 0)
+			setipaddr(iip->fsip, nt->val);
+		else
+		if(strcmp(nt->attr, "auth") == 0)
+			setipaddr(iip->auip, nt->val);
 		else
 		if(strcmp(nt->attr, "rootpath") == 0){
 			if(iip->rootpath[0] == 0)
 				strncpy(iip->rootpath, nt->val, sizeof(iip->rootpath)-1);
 		}
+		else
+		if(strcmp(nt->attr, "rootserver") == 0)
+			setipaddr(iip->rootserverip, nt->val);
+		else
+		if(strcmp(nt->attr, "vendor") == 0){
+			if(iip->vendor[0] == 0)
+				strncpy(iip->vendor, nt->val, sizeof(iip->vendor)-1);
+		}
+
 		if(hwattr != nil && strcmp(nt->attr, hwattr) == 0)
 			if(strcmp(hwval, nt->val) == 0)
 				iip->indb = 1;