diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/cmd/fs.d/mount.c | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/cmd/fs.d/mount.c')
| -rw-r--r-- | usr/src/cmd/fs.d/mount.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/cmd/fs.d/mount.c b/usr/src/cmd/fs.d/mount.c index 23c070f880..5d73ba8a30 100644 --- a/usr/src/cmd/fs.d/mount.c +++ b/usr/src/cmd/fs.d/mount.c @@ -26,6 +26,9 @@ * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + */ #include <stdio.h> #include <stdio_ext.h> @@ -503,9 +506,6 @@ gettext("%s: special cannot be determined\n"), } out: - if (check_fields(fstype, mountp)) - exit(1); - if (realpath(mountp, realdir) == NULL) { (void) fprintf(stderr, "mount: "); perror(mountp); @@ -515,6 +515,9 @@ out: if ((mountp = strdup(realdir)) == NULL) nomem(); + if (check_fields(fstype, mountp)) + exit(1); + /* create the new arg list, and end the list with a null pointer */ ii = 2; if (cflg) |