diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-28 14:25:33 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2012-11-28 14:48:01 -0500 |
| commit | a1f8afc560d59ddebd82b7620a1e70b5b0ca6216 (patch) | |
| tree | 9acac11410836b1918ce503ebd008d618b6be9ab | |
| parent | bf64ebb2faaba0666068c502353fb0c49c23c756 (diff) | |
| download | nfs-utils-a1f8afc560d59ddebd82b7620a1e70b5b0ca6216.tar.gz nfs-utils-a1f8afc560d59ddebd82b7620a1e70b5b0ca6216.tar.xz nfs-utils-a1f8afc560d59ddebd82b7620a1e70b5b0ca6216.zip | |
gssd: Remove insane sanity checks of the service name
Either we trust the info file, or we don't. The current
'checks' only work for the combination 'nfs', '100003' and
a version number between 2 and 4.
The problem is that the callback channel also wants to use
'nfs' in combination with a different program number and
version number.
This patch throws the bogus checks out altogether and lets the
kernel use whatever combination it wants....
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/gssd/gssd_proc.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index ec251fa..aa5bbb9 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -250,21 +250,10 @@ read_service_info(char *info_file_name, char **servicename, char **servername, if ((p = strstr(buf, "port")) != NULL) sscanf(p, "port: %127s\n", port); - /* check service, program, and version */ - if (memcmp(service, "nfs", 3) != 0) - return -1; + /* get program, and version numbers */ *prog = atoi(program + 1); /* skip open paren */ *vers = atoi(version); - if (strlen(service) == 3 ) { - if ((*prog != 100003) || ((*vers != 2) && (*vers != 3) && - (*vers != 4))) - goto fail; - } else if (memcmp(service, "nfs4_cb", 7) == 0) { - if (*vers != 1) - goto fail; - } - if (!addrstr_to_sockaddr(addr, address, port)) goto fail; |