Port dhcp-forwarder to -ng

git-svn-id: svn://svn.openwrt.org/openwrt/packages@4371 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2006-08-01 16:40:03 +00:00
parent 04b7f0d3b6
commit a328176fc6
4 changed files with 122 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- dhcp-forwarder-0.7/src/dhcp.h 2004-06-22 03:46:56.000000000 -0700
+++ dhcp-forwarder-0.7-x/src/dhcp.h 2005-10-06 17:04:14.000000000 -0700
@@ -89,7 +89,7 @@
optDHCP_COOKIE = 0x63538263u,
flgDHCP_BCAST = 0x0080u
#else
- DHCP_COOKIE = 0x63825363u,
+ optDHCP_COOKIE = 0x63825363u,
flgDHCP_BCAST = 0x8000u
#endif
};

View File

@ -0,0 +1,35 @@
diff -pur dhcp-forwarder-0.7-orig/src/wrappers.h dhcp-forwarder-0.7-patched/src/wrappers.h
--- dhcp-forwarder-0.7-orig/src/wrappers.h 2004-06-22 12:46:56.000000000 +0200
+++ dhcp-forwarder-0.7-patched/src/wrappers.h 2005-12-27 12:28:10.464289435 +0100
@@ -65,7 +65,14 @@ Egetgrnam(char const *name)
/*@*/
{
/*@observer@*/struct group const *res = getgrnam(name);
- FatalErrnoError(res==0, 1, "getgrnam()");
+
+ FatalErrnoError((res == NULL) && (errno != 0), 1, "getgrnam()");
+
+ if (res == NULL)
+ {
+ fprintf (stderr, "No such group: `%s'\n", name);
+ exit (1);
+ }
/*@-freshtrans@*/
/*@-mustfreefresh@*/
@@ -80,7 +87,14 @@ Egetpwnam(char const *name)
/*@*/
{
struct passwd const *res = getpwnam(name);
- FatalErrnoError(res==0, 1, "getpwnam()");
+
+ FatalErrnoError((res == NULL) && (errno != 0), 1, "getpwnam()");
+
+ if (res == NULL)
+ {
+ fprintf (stderr, "No such user: `%s'\n", name);
+ exit (1);
+ }
return res;
}