diff options
Diffstat (limited to 'meta/recipes-devtools/unfs-server/unfs-server-2.1+2.2beta47/007-map.patch')
-rw-r--r-- | meta/recipes-devtools/unfs-server/unfs-server-2.1+2.2beta47/007-map.patch | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/meta/recipes-devtools/unfs-server/unfs-server-2.1+2.2beta47/007-map.patch b/meta/recipes-devtools/unfs-server/unfs-server-2.1+2.2beta47/007-map.patch deleted file mode 100644 index e031fef2f8..0000000000 --- a/meta/recipes-devtools/unfs-server/unfs-server-2.1+2.2beta47/007-map.patch +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [other] | ||
2 | Upstream is not making further releases of this software. | ||
3 | |||
4 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
5 | |||
6 | # Patch origin: nfs-server source RPM from openSUSE 10.3 | ||
7 | |||
8 | --- nfs-server/auth.c | ||
9 | +++ nfs-server/auth.c 2002/11/08 12:49:13 | ||
10 | @@ -595,7 +595,6 @@ | ||
11 | cp->clnt_addr.s_addr = INADDR_ANY; | ||
12 | cp->flags = 0; | ||
13 | cp->m = NULL; | ||
14 | - cp->umap = NULL; | ||
15 | |||
16 | if (hname == NULL) { | ||
17 | if (anonymous_client != NULL) { | ||
18 | @@ -1200,10 +1199,9 @@ | ||
19 | free (mp->path); | ||
20 | if (mp->o.clnt_nisdomain) | ||
21 | free(mp->o.clnt_nisdomain); | ||
22 | + if (mp->umap) | ||
23 | + ugid_free_map(mp->umap); | ||
24 | free (mp); | ||
25 | - } | ||
26 | - if (cp->umap != NULL) { | ||
27 | - ugid_free_map(cp->umap); | ||
28 | } | ||
29 | free (cp); | ||
30 | } | ||
31 | --- nfs-server/auth.h | ||
32 | +++ nfs-server/auth.h 2002/11/08 12:50:24 | ||
33 | @@ -66,6 +66,11 @@ | ||
34 | char * path; | ||
35 | nfs_options o; | ||
36 | dev_t mount_dev; | ||
37 | + /* | ||
38 | + * This is the uid/gid map. | ||
39 | + * See ugid_map.c for details | ||
40 | + */ | ||
41 | + struct ugid_map * umap; | ||
42 | /* Original NFS client */ | ||
43 | struct nfs_client * origin; | ||
44 | } nfs_mount; | ||
45 | @@ -77,12 +82,6 @@ | ||
46 | char * clnt_name; | ||
47 | unsigned short flags; | ||
48 | nfs_mount * m; | ||
49 | - | ||
50 | - /* | ||
51 | - * This is the uid/gid map. | ||
52 | - * See ugid_map.c for details | ||
53 | - */ | ||
54 | - struct ugid_map * umap; | ||
55 | } nfs_client; | ||
56 | |||
57 | #define AUTH_CLNT_WILDCARD 0x0001 | ||
58 | --- nfs-server/ugid_map.c | ||
59 | +++ nfs-server/ugid_map.c 2002/11/08 12:49:14 | ||
60 | @@ -401,12 +401,11 @@ | ||
61 | static ugid_map * | ||
62 | ugid_get_map(nfs_mount *mountp) | ||
63 | { | ||
64 | - nfs_client *clientp = mountp->client; | ||
65 | struct ugid_map *umap; | ||
66 | unsigned int how; | ||
67 | |||
68 | - if (clientp->umap == NULL) { | ||
69 | - clientp->umap = umap = (ugid_map *) xmalloc(sizeof(ugid_map)); | ||
70 | + if (mountp->umap == NULL) { | ||
71 | + mountp->umap = umap = (ugid_map *) xmalloc(sizeof(ugid_map)); | ||
72 | memset(umap, 0, sizeof(ugid_map)); | ||
73 | |||
74 | for (how = 0; how < 4; how++) { | ||
75 | @@ -415,7 +414,7 @@ | ||
76 | } | ||
77 | } | ||
78 | |||
79 | - return clientp->umap; | ||
80 | + return mountp->umap; | ||
81 | } | ||
82 | |||
83 | static void | ||