Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the rest of Kerberos 4 code.

This commit is contained in:
yamt 2006-12-27 12:43:10 +00:00
parent c3ad9e4929
commit dae26da41f
2 changed files with 8 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sbin/mount_nfs/getnfsargs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: getnfsargs.c,v 1.7 2006/12/27 12:13:55 yamt Exp $ */
/* $NetBSD: getnfsargs.c,v 1.8 2006/12/27 12:43:10 yamt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: getnfsargs.c,v 1.7 2006/12/27 12:13:55 yamt Exp $");
__RCSID("$NetBSD: getnfsargs.c,v 1.8 2006/12/27 12:43:10 yamt Exp $");
#endif
#endif /* not lint */
@ -99,7 +99,6 @@ getnfsargs(char *spec, struct nfs_args *nfsargsp)
CLIENT *clp;
struct addrinfo hints, *ai_nfs, *ai;
int ecode;
char host[NI_MAXHOST], serv[NI_MAXSERV];
static struct netbuf nfs_nb;
static struct sockaddr_storage nfs_ss;
struct netconfig *nconf;
@ -159,26 +158,12 @@ getnfsargs(char *spec, struct nfs_args *nfsargsp)
#endif /* ISO */
/*
* Handle an internet host address and reverse resolve it if
* doing Kerberos.
* Handle an internet host address.
*/
memset(&hints, 0, sizeof hints);
hints.ai_flags = AI_NUMERICHOST;
hints.ai_socktype = nfsargsp->sotype;
if (getaddrinfo(hostp, "nfs", &hints, &ai_nfs) == 0) {
if ((nfsargsp->flags & NFSMNT_KERB)) {
hints.ai_flags = 0;
if ((ecode = getnameinfo(ai_nfs->ai_addr,
ai_nfs->ai_addrlen, host, sizeof(host),
serv, sizeof serv, 0)) != 0) {
warnx("can't reverse resolve net address for "
"host \"%s\": %s", hostp,
gai_strerror(ecode));
return (0);
}
hostp = host;
}
} else {
if (getaddrinfo(hostp, "nfs", &hints, &ai_nfs) != 0) {
hints.ai_flags = 0;
if ((ecode = getaddrinfo(hostp, "nfs", &hints, &ai_nfs)) != 0) {
warnx("can't get net id for host \"%s\": %s", hostp,
@ -253,10 +238,7 @@ tryagain:
clp->cl_auth = authsys_create_default();
try.tv_sec = 10;
try.tv_usec = 0;
if (nfsargsp->flags & NFSMNT_KERB)
nfhret.auth = RPCAUTH_KERB4;
else
nfhret.auth = RPCAUTH_UNIX;
nfhret.auth = RPCAUTH_UNIX;
nfhret.vers = mntvers;
clnt_stat = clnt_call(clp, RPCMNT_MOUNT,
xdr_dir, spec, xdr_fh, &nfhret, try);

33
sbin/mount_nfs/mount_nfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_nfs.c,v 1.56 2006/12/27 12:13:55 yamt Exp $ */
/* $NetBSD: mount_nfs.c,v 1.57 2006/12/27 12:43:10 yamt Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: mount_nfs.c,v 1.56 2006/12/27 12:13:55 yamt Exp $");
__RCSID("$NetBSD: mount_nfs.c,v 1.57 2006/12/27 12:43:10 yamt Exp $");
#endif
#endif /* not lint */
@ -83,7 +83,6 @@ __RCSID("$NetBSD: mount_nfs.c,v 1.56 2006/12/27 12:13:55 yamt Exp $");
#define ALTF_CONN 0x00000002
#define ALTF_DUMBTIMR 0x00000004
#define ALTF_INTR 0x00000008
#define ALTF_KERB 0x00000010
#define ALTF_NFSV3 0x00000020
#define ALTF_RDIRPLUS 0x00000040
#define ALTF_MNTUDP 0x00000080
@ -188,9 +187,8 @@ mount_nfs(int argc, char *argv[])
int c, retval;
struct nfs_args *nfsargsp;
struct nfs_args nfsargs;
struct nfsd_cargs ncd;
struct sockaddr_storage sa;
int mntflags, altflags, i, nfssvc_flag, num;
int mntflags, altflags, num;
char name[MAXPATHLEN], *p, *spec;
mntoptparse_t mp;
retrycnt = DEF_RETRY;
@ -470,31 +468,6 @@ retry:
return (0);
}
if (nfsargsp->flags & NFSMNT_KERB) {
if ((opflags & ISBGRND) == 0) {
if ((i = fork()) != 0) {
if (i == -1)
err(1, "nqnfs 1");
exit(0);
}
(void) setsid();
(void) close(STDIN_FILENO);
(void) close(STDOUT_FILENO);
(void) close(STDERR_FILENO);
(void) chdir("/");
}
openlog("mount_nfs", LOG_PID, LOG_DAEMON);
nfssvc_flag = NFSSVC_MNTD;
ncd.ncd_dirp = name;
while (nfssvc(nfssvc_flag, (caddr_t)&ncd) < 0) {
if (errno != ENEEDAUTH) {
syslog(LOG_ERR, "nfssvc err %m");
continue;
}
nfssvc_flag =
NFSSVC_MNTD | NFSSVC_GOTAUTH | NFSSVC_AUTHINFAIL;
}
}
exit(0);
}