diff options
author | Florian Fainelli <florian@openwrt.org> | 2006-01-10 06:37:43 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2006-01-10 06:37:43 +0000 |
commit | 67ee15962b72a837c1b2aa08c8eea0300ebde48d (patch) | |
tree | c43f53436ead4e92fc1b71a69d78863b4199181b | |
parent | 85fafa691005bade399dd166952996d2d6e40f95 (diff) | |
download | mtk-20170518-67ee15962b72a837c1b2aa08c8eea0300ebde48d.zip mtk-20170518-67ee15962b72a837c1b2aa08c8eea0300ebde48d.tar.gz mtk-20170518-67ee15962b72a837c1b2aa08c8eea0300ebde48d.tar.bz2 |
Better handling of getpwnam and getgrnam for dhcp-forwarde
SVN-Revision: 2868
-rw-r--r-- | openwrt/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/openwrt/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch b/openwrt/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch new file mode 100644 index 0000000..ef84913 --- /dev/null +++ b/openwrt/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch @@ -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; + } |