X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fovsdb-server.c;h=0d95cb2e67fcfb4cfd12e855aa1a937132319dba;hb=fb0d597fb64308c60001e3afc9b31eb295dedb6b;hp=243243d2e08bf7b13ff1e1024878c0fb78d64db7;hpb=78876719e0eaf181a6775417ad41ec5852efa863;p=openvswitch

diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 243243d2..0d95cb2e 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -49,11 +49,13 @@
 #include "vlog.h"
 #define THIS_MODULE VLM_ovsdb_server
 
+#if HAVE_OPENSSL
 /* SSL configuration. */
 static char *private_key_file;
 static char *certificate_file;
 static char *ca_cert_file;
 static bool bootstrap_ca_cert;
+#endif
 
 static unixctl_cb_func ovsdb_server_exit;
 static unixctl_cb_func ovsdb_server_compact;
@@ -206,6 +208,7 @@ parse_db_string_column(const struct ovsdb *db,
     *tablep = table;
 }
 
+#if HAVE_OPENSSL
 static const char *
 query_db_string(const struct ovsdb *db, const char *name)
 {
@@ -232,6 +235,7 @@ query_db_string(const struct ovsdb *db, const char *name)
         return NULL;
     }
 }
+#endif /* HAVE_OPENSSL */
 
 static void
 query_db_remotes(const char *name, const struct ovsdb *db,
@@ -276,11 +280,13 @@ reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc,
     ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes);
     shash_destroy(&resolved_remotes);
 
+#if HAVE_OPENSSL
     /* Configure SSL. */
     stream_ssl_set_private_key_file(query_db_string(db, private_key_file));
     stream_ssl_set_certificate_file(query_db_string(db, certificate_file));
     stream_ssl_set_ca_cert_file(query_db_string(db, ca_cert_file),
                                 bootstrap_ca_cert);
+#endif
 }
 
 static void
@@ -433,6 +439,7 @@ usage(void)
     vlog_usage();
     printf("\nOther options:\n"
            "  --run COMMAND           run COMMAND as subprocess then exit\n"
+           "  --unixctl=SOCKET        override default control socket name\n"
            "  -h, --help              display this help message\n"
            "  -V, --version           display version information\n");
     leak_checker_usage();