diff options
author | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:43:18 +0000 |
---|---|---|
committer | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:43:18 +0000 |
commit | c4aa323138d7633d35c7cbf4123aa100970a91f9 (patch) | |
tree | 596fe3d0c3374835bf0e2e1d31e3ea8f3659422a /usr/src/lib/libiscsit/common/libiscsit.c | |
parent | 73c531dd5303a633bcaaf609c6eeb2554096b478 (diff) | |
parent | f9b22ee9e48b04a9ef01426e92a13c5b164c0763 (diff) | |
download | illumos-joyent-c4aa323138d7633d35c7cbf4123aa100970a91f9.tar.gz |
Merge branch 'master' into gcc4
Diffstat (limited to 'usr/src/lib/libiscsit/common/libiscsit.c')
-rw-r--r-- | usr/src/lib/libiscsit/common/libiscsit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/lib/libiscsit/common/libiscsit.c b/usr/src/lib/libiscsit/common/libiscsit.c index 9530419701..c45b9b1c1d 100644 --- a/usr/src/lib/libiscsit/common/libiscsit.c +++ b/usr/src/lib/libiscsit/common/libiscsit.c @@ -21,6 +21,9 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + */ #include <sys/types.h> #include <sys/stat.h> @@ -1846,10 +1849,10 @@ it_iqn_generate(char *iqn_buf, int iqn_buf_len, char *opt_iqn_suffix) uuid_unparse(id, id_str); if (opt_iqn_suffix) { - ret = snprintf(iqn_buf, iqn_buf_len, "iqn.1986-03.com.sun:" + ret = snprintf(iqn_buf, iqn_buf_len, DEFAULT_IQN "%02d:%s.%s", TARGET_NAME_VERS, id_str, opt_iqn_suffix); } else { - ret = snprintf(iqn_buf, iqn_buf_len, "iqn.1986-03.com.sun:" + ret = snprintf(iqn_buf, iqn_buf_len, DEFAULT_IQN "%02d:%s", TARGET_NAME_VERS, id_str); } |