[package] update nfs-utils patch (#4893)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15150 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
396dfac0af
commit
a8f625a062
@ -1,34 +0,0 @@
|
|||||||
Index: nfs-utils-1.1.2/support/nfs/svc_socket.c
|
|
||||||
===================================================================
|
|
||||||
--- nfs-utils-1.1.2.orig/support/nfs/svc_socket.c 2008-04-13 10:38:24.000000000 +0200
|
|
||||||
+++ nfs-utils-1.1.2/support/nfs/svc_socket.c 2008-04-13 10:38:24.000000000 +0200
|
|
||||||
@@ -67,8 +67,10 @@
|
|
||||||
memset (&addr, 0, sizeof (addr));
|
|
||||||
addr.sin_family = AF_INET;
|
|
||||||
|
|
||||||
- ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
|
||||||
- &rpcp);
|
|
||||||
+// ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
|
||||||
+// &rpcp);
|
|
||||||
+ rpcp = getrpcbynumber (number);
|
|
||||||
+ ret = 0;
|
|
||||||
if (ret == 0 && rpcp != NULL)
|
|
||||||
{
|
|
||||||
/* First try name. */
|
|
||||||
Index: nfs-utils-1.1.2/support/nfs/svc_socket.c
|
|
||||||
===================================================================
|
|
||||||
--- nfs-utils-1.1.2.orig/support/nfs/svc_socket.c 2008-04-13 10:38:24.000000000 +0200
|
|
||||||
+++ nfs-utils-1.1.2/support/nfs/svc_socket.c 2008-04-13 10:38:24.000000000 +0200
|
|
||||||
@@ -67,8 +67,10 @@
|
|
||||||
memset (&addr, 0, sizeof (addr));
|
|
||||||
addr.sin_family = AF_INET;
|
|
||||||
|
|
||||||
- ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
|
||||||
- &rpcp);
|
|
||||||
+// ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
|
||||||
+// &rpcp);
|
|
||||||
+ rpcp = getrpcbynumber (number);
|
|
||||||
+ ret = 0;
|
|
||||||
if (ret == 0 && rpcp != NULL)
|
|
||||||
{
|
|
||||||
/* First try name. */
|
|
37
net/nfs-utils/patches/001-nfs_utils_uclibc.patch
Normal file
37
net/nfs-utils/patches/001-nfs_utils_uclibc.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
diff -urN nfs-utils-1.1.5/utils/mountd/cache.c nfs-utils-1.1.5.new/utils/mountd/cache.c
|
||||||
|
--- nfs-utils-1.1.5/utils/mountd/cache.c 2009-03-05 12:42:56.000000000 +0100
|
||||||
|
+++ nfs-utils-1.1.5.new/utils/mountd/cache.c 2009-04-07 16:11:09.000000000 +0200
|
||||||
|
@@ -142,6 +142,7 @@
|
||||||
|
pw = getpwuid(uid);
|
||||||
|
if (!pw)
|
||||||
|
rv = -1;
|
||||||
|
+#ifndef __UCLIBC__
|
||||||
|
else {
|
||||||
|
rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
|
||||||
|
if (rv == -1 && ngroups >= 100) {
|
||||||
|
@@ -153,6 +154,7 @@
|
||||||
|
groups, &ngroups);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#endif /* __UCLIBC__ */
|
||||||
|
qword_printint(f, uid);
|
||||||
|
qword_printint(f, time(0)+30*60);
|
||||||
|
if (rv >= 0) {
|
||||||
|
diff -burN nfs-utils-1.1.5/support/nfs/svc_socket.c nfs-utils-1.1.5.p/support/nfs/svc_socket.c
|
||||||
|
--- nfs-utils-1.1.5/support/nfs/svc_socket.c 2009-03-05 12:42:56.000000000 +0100
|
||||||
|
+++ nfs-utils-1.1.5.p/support/nfs/svc_socket.c 2009-04-07 17:33:07.307458029 +0200
|
||||||
|
@@ -66,9 +66,13 @@
|
||||||
|
|
||||||
|
memset (&addr, 0, sizeof (addr));
|
||||||
|
addr.sin_family = AF_INET;
|
||||||
|
-
|
||||||
|
+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
|
||||||
|
ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
|
||||||
|
&rpcp);
|
||||||
|
+#else
|
||||||
|
+ rpcp = getrpcbynumber (number);
|
||||||
|
+ ret = 0;
|
||||||
|
+#endif
|
||||||
|
if (ret == 0 && rpcp != NULL)
|
||||||
|
{
|
||||||
|
/* First try name. */
|
@ -1,33 +0,0 @@
|
|||||||
Index: nfs-utils-1.1.2/utils/mountd/cache.c
|
|
||||||
===================================================================
|
|
||||||
--- nfs-utils-1.1.2.orig/utils/mountd/cache.c 2008-04-13 10:38:24.000000000 +0200
|
|
||||||
+++ nfs-utils-1.1.2/utils/mountd/cache.c 2008-04-13 10:38:25.000000000 +0200
|
|
||||||
@@ -141,17 +141,17 @@
|
|
||||||
pw = getpwuid(uid);
|
|
||||||
if (!pw)
|
|
||||||
rv = -1;
|
|
||||||
- else {
|
|
||||||
- rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
|
|
||||||
- if (rv == -1 && ngroups >= 100) {
|
|
||||||
- groups = malloc(sizeof(gid_t)*ngroups);
|
|
||||||
- if (!groups)
|
|
||||||
- rv = -1;
|
|
||||||
- else
|
|
||||||
- rv = getgrouplist(pw->pw_name, pw->pw_gid,
|
|
||||||
- groups, &ngroups);
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
+// else {
|
|
||||||
+// rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
|
|
||||||
+// if (rv == -1 && ngroups >= 100) {
|
|
||||||
+// groups = malloc(sizeof(gid_t)*ngroups);
|
|
||||||
+// if (!groups)
|
|
||||||
+// rv = -1;
|
|
||||||
+// else
|
|
||||||
+// rv = getgrouplist(pw->pw_name, pw->pw_gid,
|
|
||||||
+// groups, &ngroups);
|
|
||||||
+// }
|
|
||||||
+// }
|
|
||||||
qword_printint(f, uid);
|
|
||||||
qword_printint(f, time(0)+30*60);
|
|
||||||
if (rv >= 0) {
|
|
Loading…
x
Reference in New Issue
Block a user