Deleted Added
full compact
mount_nfs.c (2776) mount_nfs.c (2999)
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 134 unchanged lines hidden (view full) ---

143{
144 register int c;
145 register struct nfs_args *nfsargsp;
146 struct nfs_args nfsargs;
147 struct nfsd_cargs ncd;
148 int mntflags, i, nfssvc_flag, num;
149 char *name, *p, *spec;
150 int error = 0;
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 134 unchanged lines hidden (view full) ---

143{
144 register int c;
145 register struct nfs_args *nfsargsp;
146 struct nfs_args nfsargs;
147 struct nfsd_cargs ncd;
148 int mntflags, i, nfssvc_flag, num;
149 char *name, *p, *spec;
150 int error = 0;
151 struct vfsconf *vfc;
151#ifdef KERBEROS
152 uid_t last_ruid;
153#endif
154
155#ifdef KERBEROS
156 last_ruid = -1;
157 (void)strcpy(realm, KRB_REALM);
158#endif

--- 130 unchanged lines hidden (view full) ---

289 if (argc != 2)
290 error = 1;
291
292 spec = *argv++;
293 name = *argv;
294
295 if (!getnfsargs(spec, nfsargsp))
296 exit(1);
152#ifdef KERBEROS
153 uid_t last_ruid;
154#endif
155
156#ifdef KERBEROS
157 last_ruid = -1;
158 (void)strcpy(realm, KRB_REALM);
159#endif

--- 130 unchanged lines hidden (view full) ---

290 if (argc != 2)
291 error = 1;
292
293 spec = *argv++;
294 name = *argv;
295
296 if (!getnfsargs(spec, nfsargsp))
297 exit(1);
297 if (mount(MOUNT_NFS, name, mntflags, nfsargsp))
298
299 vfc = getvfsbyname("nfs");
300 if(!vfc && vfsisloadable("nfs")) {
301 if(vfsload("nfs"))
302 err(1, "vfsload(nfs)");
303 endvfsent(); /* flush cache */
304 vfc = getvfsbyname("nfs");
305 }
306
307 if (mount(vfc ? vfc->vfc_index : MOUNT_NFS, name, mntflags, nfsargsp))
298 err(1, "%s", name);
299 if (nfsargsp->flags & (NFSMNT_NQNFS | NFSMNT_KERB)) {
300 if ((opflags & ISBGRND) == 0) {
301 if (i = fork()) {
302 if (i == -1)
303 err(1, "nqnfs 1");
304 exit(0);
305 }

--- 247 unchanged lines hidden ---
308 err(1, "%s", name);
309 if (nfsargsp->flags & (NFSMNT_NQNFS | NFSMNT_KERB)) {
310 if ((opflags & ISBGRND) == 0) {
311 if (i = fork()) {
312 if (i == -1)
313 err(1, "nqnfs 1");
314 exit(0);
315 }

--- 247 unchanged lines hidden ---