[PATCH 2/5] Fix: two command-line options had no effect.

[Christopher Brannon]

The --communication-method and --socket-name command-line options
should be able to override values from the configuration file.
---
 src/server/config.c  |    4 ++--
 src/server/options.c |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/server/config.c b/src/server/config.c
index 2aa4319..c2cb0de 100644
--- a/src/server/config.c
+++ b/src/server/config.c
@@ -189,8 +189,8 @@ GLOBAL_FDSET_OPTION_CB_SPECIAL(DefaultVoiceType, voice, 
EVoiceType, str2EVoice)
 GLOBAL_FDSET_OPTION_CB_SPECIAL(DefaultPunctuationMode, punctuation_mode, 
EPunctMode, str2EPunctMode)
 GLOBAL_FDSET_OPTION_CB_SPECIAL(DefaultCapLetRecognition, cap_let_recogn, 
ECapLetRecogn, str2ECapLetRecogn)
 
-SPEECHD_OPTION_CB_STR(CommunicationMethod, communication_method)
-SPEECHD_OPTION_CB_STR(SocketName, socket_name)
+SPEECHD_OPTION_CB_STR_M(CommunicationMethod, communication_method)
+SPEECHD_OPTION_CB_STR_M(SocketName, socket_name)
 SPEECHD_OPTION_CB_INT_M(Port, port, val>=0, "Invalid port number!")
 SPEECHD_OPTION_CB_INT_M(LocalhostAccessOnly, localhost_access_only, val>=0, 
"Invalid access controll mode!")
 GLOBAL_SET_LOGLEVEL(LogLevel, log_level, (val>=0)&&(val<=5), "Invalid log 
(verbosity) level!")
diff --git a/src/server/options.c b/src/server/options.c
index 2c3e5cc..1da4cc3 100644
--- a/src/server/options.c
+++ b/src/server/options.c
@@ -115,9 +115,11 @@ options_parse(int argc, char *argv[])
             break;
         case 'c':
             SPD_OPTION_SET_STR(communication_method);
+            SpeechdOptions.communication_method_set = 1;
             break;
         case 'S':
             SPD_OPTION_SET_STR(socket_name);
+            SpeechdOptions.socket_name_set = 1;
             break;
         case 'p':
             SPD_OPTION_SET_INT(port);
-- 
1.7.1