diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-05 11:43:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-05 11:43:50 +0000 |
| commit | 6b20f5ea86f57e29a5ccd067ee5cc5d59cad981e (patch) | |
| tree | 035b51d5fceb0c9d5945ba1ab0474371720c878f /usr/src/lib | |
| parent | 4263771df9801298a3c76c40fc650aab69de04e7 (diff) | |
| parent | 0222d5accac6e2a33600db46cd235825f511de93 (diff) | |
| download | illumos-joyent-6b20f5ea86f57e29a5ccd067ee5cc5d59cad981e.tar.gz | |
[illumos-gate merge]
commit 0222d5accac6e2a33600db46cd235825f511de93
6143 Want zoneadm list option for non-global zones only
commit 17a5fa85fe0c34b1146222e40a80b42f2aae8500
11108 error: NULL pointer errors
commit 1304f648fa20f6bea9d7aa8c2d089ade63ce703c
11104 ldd: NULL pointer errors
commit aef9542424e6d6265e68f87a0d573b10ba6a9e1a
11094 libelf: NULL pointer errors
commit 4291d474bf7698f3f2016d029ffa665f5b436beb
11077 tem: do not restore image areas also in text mode
commit 13a6e30d92032118a54c980158e488cf0aed1abf
11082 loader: Unexpand be32dec()
commit 6512942d214590d054e346dac0ae8ce162c1359d
11089 libsldap: return makes integer from pointer without a cast
Conflicts:
usr/src/cmd/zoneadm/zoneadm.c
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libsldap/common/ns_reads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libsldap/common/ns_reads.c b/usr/src/lib/libsldap/common/ns_reads.c index 83e93cd3d0..d18b1fc580 100644 --- a/usr/src/lib/libsldap/common/ns_reads.c +++ b/usr/src/lib/libsldap/common/ns_reads.c @@ -4293,7 +4293,7 @@ __ns_ldap_dn2uid(const char *dn, (void) sprintf(errstr, gettext("Too many entries are returned for %s"), dn); MKERROR(LOG_WARNING, *errorp, NS_LDAP_INTERNAL, strdup(errstr), - NULL); + 0); rc = NS_LDAP_INTERNAL; goto out; } |