| zfs_main.c (240415) | zfs_main.c (240696) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 6286 unchanged lines hidden (view full) --- 6295 (void) fprintf(stderr, gettext("missing argument(s)\n")); 6296 usage(B_FALSE); 6297 } 6298 if (argc > 3) { 6299 (void) fprintf(stderr, gettext("too many arguments\n")); 6300 usage(B_FALSE); 6301 } 6302 | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 6286 unchanged lines hidden (view full) --- 6295 (void) fprintf(stderr, gettext("missing argument(s)\n")); 6296 usage(B_FALSE); 6297 } 6298 if (argc > 3) { 6299 (void) fprintf(stderr, gettext("too many arguments\n")); 6300 usage(B_FALSE); 6301 } 6302 |
| 6303 jailid = atoi(argv[1]); 6304 if (jailid == 0) { 6305 (void) fprintf(stderr, gettext("invalid jailid\n")); | 6303 jailid = jail_getid(argv[1]); 6304 if (jailid < 0) { 6305 (void) fprintf(stderr, gettext("invalid jail id or name\n")); |
| 6306 usage(B_FALSE); 6307 } 6308 6309 zhp = zfs_open(g_zfs, argv[2], ZFS_TYPE_FILESYSTEM); 6310 if (zhp == NULL) 6311 return (1); 6312 6313 ret = (zfs_jail(zhp, jailid, attach) != 0); --- 360 unchanged lines hidden --- | 6306 usage(B_FALSE); 6307 } 6308 6309 zhp = zfs_open(g_zfs, argv[2], ZFS_TYPE_FILESYSTEM); 6310 if (zhp == NULL) 6311 return (1); 6312 6313 ret = (zfs_jail(zhp, jailid, attach) != 0); --- 360 unchanged lines hidden --- |