svn commit: r254758 - head/cddl/contrib/opensolaris/cmd/zpool

[Xin LI]

Author: delphij
Date: Sat Aug 24 00:54:47 2013
New Revision: 254758
URL: http://svnweb.freebsd.org/changeset/base/254758

Log:
  MFV r254751:
  
  Don't treat the parameter as a number (pool GUID) when there is
  error converting it from string, instead, treat it as the pool
  name.
  
  Illumos ZFS issues:
    1765 assert triggered in libzfs_import.c trying to import pool
         name beginning with a number

Modified:
  head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Aug 24 00:42:37 2013	(r254757)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Aug 24 00:54:47 2013	(r254758)
@@ -25,6 +25,7 @@
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
+ * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
  */
 
 #include <solaris.h>
@@ -2128,8 +2129,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;
 
 		/*