svn commit: r254751 - vendor/illumos/dist/cmd/zpool

[Xin LI]

Author: delphij
Date: Fri Aug 23 23:47:59 2013
New Revision: 254751
URL: http://svnweb.freebsd.org/changeset/base/254751

Log:
  Update vendor/illumos/dist to 14160:734110b9882f:
  
  Illumos ZFS issues:
    1765 assert triggered in libzfs_import.c trying to import pool
         name beginning with a number

Modified:
  vendor/illumos/dist/cmd/zpool/zpool_main.c

Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_main.c	Fri Aug 23 23:46:27 2013	(r254750)
+++ vendor/illumos/dist/cmd/zpool/zpool_main.c	Fri Aug 23 23:47:59 2013	(r254751)
@@ -24,6 +24,7 @@
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
+ * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
  */
 
 #include <assert.h>
@@ -1988,8 +1989,10 @@ zpool_do_import(int argc, char **argv)
 
 		errno = 0;
 		searchguid = strtoull(argv[0], &endptr, 10);
-		if (errno != 0 || *endptr != '\0')
+		if (errno != 0 || *endptr != '\0') {
 			searchname = argv[0];
+			searchguid = 0;
+		}
 		found_config = NULL;
 
 		/*