oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Remove untested patch that sneaked in.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16201 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-10-20 14:59:20 +00:00
parent 8de40c5202
commit 256cf0f403
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/kafs/afssys.c
View File

@@ -164,38 +164,11 @@ map_syscall_name_to_number (const char *str, int *res)
static int static int
try_ioctlpath(const char *path, int entrypoint) try_ioctlpath(const char *path, int entrypoint)
{ {
int fd, ret, saved_errno; int fd;
fd = open(path, O_RDWR); fd = open(path, O_RDWR);
if (fd < 0) if (fd < 0)
return 1; return 1;
switch (entrypoint) {
case LINUX_PROC_POINT: {
struct procdata data = { 0, 0, 0, 0, AFSCALL_PIOCTL };
data.param2 = (unsigned long)VIOCGETTOK;
ret = ioctl(fd, VIOC_SYSCALL_PROC, &data);
break;
}
case MACOS_DEV_POINT: {
struct devdata data = { AFSCALL_PIOCTL, 0, 0, 0, 0, 0, 0, 0 };
data.param2 = (unsigned long)VIOCGETTOK;
ret = ioctl(fd, VIOC_SYSCALL_DEV, &data);
break;
}
default:
abort();
}
saved_errno = errno;
close(fd); close(fd);
/*
* Be quite liberal in what error are ok, the first is the one
* that should trigger given that params is NULL.
*/
if (ret &&
(saved_errno != EFAULT &&
saved_errno != EDOM &&
saved_errno != ENOTCONN))
return 1;
afs_ioctlpath = strdup(path); afs_ioctlpath = strdup(path);
if (afs_ioctlpath == NULL) if (afs_ioctlpath == NULL)
return 1; return 1;