aboutsummaryrefslogtreecommitdiff
path: root/server-fn.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-07-01 19:15:12 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-07-01 19:15:12 +0000
commit55f8219d3ccb594ada6c201599dc635a71aebca0 (patch)
tree41c9564ee8324e26c6ce692913af5fb2301d7767 /server-fn.c
parent35092835b04fda9ab5b13517701d0ee096abe1c0 (diff)
downloadrtmux-55f8219d3ccb594ada6c201599dc635a71aebca0.tar.gz
rtmux-55f8219d3ccb594ada6c201599dc635a71aebca0.tar.bz2
rtmux-55f8219d3ccb594ada6c201599dc635a71aebca0.zip
When unlocking the server, don't try to clear the prompt on clients without a
prompt (such as the one issuing the unlock request). This caused the server to die if the wrong password was entered when unlocking from the command line with -U (nasty).
Diffstat (limited to 'server-fn.c')
-rw-r--r--server-fn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server-fn.c b/server-fn.c
index 8d8bf7ad..f1483568 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.64 2009-06-25 17:02:59 nicm Exp $ */
+/* $Id: server-fn.c,v 1.65 2009-07-01 19:15:12 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -215,7 +215,7 @@ server_unlock(const char *s)
wrong:
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (c == NULL)
+ if (c == NULL || c->prompt_buffer == NULL)
continue;
*c->prompt_buffer = '\0';