diff options
author | Scott Garman <scott.a.garman@intel.com> | 2010-08-12 21:02:58 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 16:20:09 +0100 |
commit | b5b3825ce6df45b16e1f3e15001da213bc8b0a55 (patch) | |
tree | b2577de0765074d6e2bdbbdf1862220b52e8d7c1 /meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch | |
parent | 735210556dc709b3c2367389fa6ea9c0109412b1 (diff) | |
download | poky-b5b3825ce6df45b16e1f3e15001da213bc8b0a55.tar.gz |
unfs-server: new userspace nfs recipe
This is a simple userspace NFS server, derived from one which was
previously used in openSUSE 10.x. Wind River contributed many of the
patches.
This package is not intended for target installations, only -native
and -nativesdk use.
Enabling nativesdk for readline, sqlite3, and pseudo was required, as
well as a few new autoconf siteconfig entries.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch')
-rw-r--r-- | meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch b/meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch new file mode 100644 index 0000000000..89baabe1c2 --- /dev/null +++ b/meta/packages/unfs-server/unfs-server-2.2beta47/007-map.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | # Patch origin: nfs-server source RPM from openSUSE 10.3 | ||
2 | |||
3 | --- nfs-server/auth.c | ||
4 | +++ nfs-server/auth.c 2002/11/08 12:49:13 | ||
5 | @@ -595,7 +595,6 @@ | ||
6 | cp->clnt_addr.s_addr = INADDR_ANY; | ||
7 | cp->flags = 0; | ||
8 | cp->m = NULL; | ||
9 | - cp->umap = NULL; | ||
10 | |||
11 | if (hname == NULL) { | ||
12 | if (anonymous_client != NULL) { | ||
13 | @@ -1200,10 +1199,9 @@ | ||
14 | free (mp->path); | ||
15 | if (mp->o.clnt_nisdomain) | ||
16 | free(mp->o.clnt_nisdomain); | ||
17 | + if (mp->umap) | ||
18 | + ugid_free_map(mp->umap); | ||
19 | free (mp); | ||
20 | - } | ||
21 | - if (cp->umap != NULL) { | ||
22 | - ugid_free_map(cp->umap); | ||
23 | } | ||
24 | free (cp); | ||
25 | } | ||
26 | --- nfs-server/auth.h | ||
27 | +++ nfs-server/auth.h 2002/11/08 12:50:24 | ||
28 | @@ -66,6 +66,11 @@ | ||
29 | char * path; | ||
30 | nfs_options o; | ||
31 | dev_t mount_dev; | ||
32 | + /* | ||
33 | + * This is the uid/gid map. | ||
34 | + * See ugid_map.c for details | ||
35 | + */ | ||
36 | + struct ugid_map * umap; | ||
37 | /* Original NFS client */ | ||
38 | struct nfs_client * origin; | ||
39 | } nfs_mount; | ||
40 | @@ -77,12 +82,6 @@ | ||
41 | char * clnt_name; | ||
42 | unsigned short flags; | ||
43 | nfs_mount * m; | ||
44 | - | ||
45 | - /* | ||
46 | - * This is the uid/gid map. | ||
47 | - * See ugid_map.c for details | ||
48 | - */ | ||
49 | - struct ugid_map * umap; | ||
50 | } nfs_client; | ||
51 | |||
52 | #define AUTH_CLNT_WILDCARD 0x0001 | ||
53 | --- nfs-server/ugid_map.c | ||
54 | +++ nfs-server/ugid_map.c 2002/11/08 12:49:14 | ||
55 | @@ -401,12 +401,11 @@ | ||
56 | static ugid_map * | ||
57 | ugid_get_map(nfs_mount *mountp) | ||
58 | { | ||
59 | - nfs_client *clientp = mountp->client; | ||
60 | struct ugid_map *umap; | ||
61 | unsigned int how; | ||
62 | |||
63 | - if (clientp->umap == NULL) { | ||
64 | - clientp->umap = umap = (ugid_map *) xmalloc(sizeof(ugid_map)); | ||
65 | + if (mountp->umap == NULL) { | ||
66 | + mountp->umap = umap = (ugid_map *) xmalloc(sizeof(ugid_map)); | ||
67 | memset(umap, 0, sizeof(ugid_map)); | ||
68 | |||
69 | for (how = 0; how < 4; how++) { | ||
70 | @@ -415,7 +414,7 @@ | ||
71 | } | ||
72 | } | ||
73 | |||
74 | - return clientp->umap; | ||
75 | + return mountp->umap; | ||
76 | } | ||
77 | |||
78 | static void | ||