summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ssh/libssh
diff options
context:
space:
mode:
authorjp161948 <none@none>2006-11-13 15:06:43 -0800
committerjp161948 <none@none>2006-11-13 15:06:43 -0800
commita6e0e77db3495a73e0c084496fedccf16413a311 (patch)
tree33ba8a53824e245bdae66081be7f44881fe8a29d /usr/src/cmd/ssh/libssh
parent93a6f655de601ef9f8e8bfeca1b816fbfca6bc17 (diff)
downloadillumos-gate-a6e0e77db3495a73e0c084496fedccf16413a311.tar.gz
6432078 SUNWsshdu should depend on SUNWloc
6432083 sshd dumps core if /usr/bin/locale is missing or gives an empty output 6470249 ssh support for X forwarding is broken 6484979 typo in 'frunction' in cmd/ssh/libssh/common/log.c
Diffstat (limited to 'usr/src/cmd/ssh/libssh')
-rw-r--r--usr/src/cmd/ssh/libssh/common/g11n.c3
-rw-r--r--usr/src/cmd/ssh/libssh/common/log.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/g11n.c b/usr/src/cmd/ssh/libssh/common/g11n.c
index 41116d2c1e..95b61bef62 100644
--- a/usr/src/cmd/ssh/libssh/common/g11n.c
+++ b/usr/src/cmd/ssh/libssh/common/g11n.c
@@ -270,6 +270,9 @@ g11n_getlocales()
list[n_elems++] = xstrdup(locale);
}
+ if (n_elems == 0)
+ return (NULL);
+
list[n_elems] = NULL;
(void) pclose(locale_out);
diff --git a/usr/src/cmd/ssh/libssh/common/log.c b/usr/src/cmd/ssh/libssh/common/log.c
index 296c52a3f1..79e4cace6e 100644
--- a/usr/src/cmd/ssh/libssh/common/log.c
+++ b/usr/src/cmd/ssh/libssh/common/log.c
@@ -230,7 +230,7 @@ fatal_add_cleanup(void (*proc) (void *), void *context)
fatal_cleanups = cu;
}
-/* Removes a cleanup frunction to be called at fatal(). */
+/* Removes a cleanup function to be called at fatal(). */
void
fatal_remove_cleanup(void (*proc) (void *context), void *context)