Allow not specifying service names.

diff --git a/daemon/client.c b/daemon/client.c
index 65e135d06b629aadb60a027da9f533550e718b12..c64436354f5182b9a76a96b8699a5159bb97bdc2 100644 (file)
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -22,6 +22,7 @@
 #endif
 #include <pwd.h>
 #include "internals.h"
+#include "daemon/daemon.h"
 #include "daemon/client.h"
 #include "daemon/user.h"
 #include "daemon/backend.h"
@@ -48,28 +49,30 @@ void daemon_client_kill(struct daemon_client *dc)
        }
 
        daemon_user_free(dc->user);
-       g_free(dc->credentials.nick);
-       g_free(dc->credentials.password);
-       g_free(dc->credentials.realname);
-       g_free(dc->credentials.servername);
-       g_free(dc->credentials.servicename);
-       g_free(dc->credentials.unused);
-       g_free(dc->credentials.username);
+       g_free(dc->login_details->nick);
+       g_free(dc->login_details->password);
+       g_free(dc->login_details->realname);
+       g_free(dc->login_details->servername);
+       g_free(dc->login_details->servicename);
+       g_free(dc->login_details->unused);
+       g_free(dc->login_details->username);
+       g_free(dc->login_details);
        g_free(dc->description);
        g_free(dc);
 
-       if (dc->inetd)
+       if (dc->inetd) {
                exit(0);
+       }
 }
 
 void daemon_client_forward_credentials(struct daemon_client *dc)
 {
        g_assert(dc->backend != NULL);
 
-       if (dc->credentials.servername != NULL && dc->credentials.servicename != NULL)
-               transport_send_args(dc->backend->transport, "CONNECT", dc->credentials.servername, dc->credentials.servicename, NULL);
-       transport_send_args(dc->backend->transport, "USER", dc->credentials.username, dc->credentials.mode, dc->credentials.unused, dc->credentials.realname, NULL);
-       transport_send_args(dc->backend->transport, "NICK", dc->credentials.nick, NULL);
+       if (dc->login_details->servername != NULL)
+               transport_send_args(dc->backend->transport, "CONNECT", dc->login_details->servername, dc->login_details->servicename, NULL);
+       transport_send_args(dc->backend->transport, "USER", dc->login_details->username, dc->login_details->mode, dc->login_details->unused, dc->login_details->realname, NULL);
+       transport_send_args(dc->backend->transport, "NICK", dc->login_details->nick, NULL);
 
        daemon_clients = g_list_append(daemon_clients, dc);
 }

diff --git a/daemon/client.h b/daemon/client.h
index 92855026650fa842d248e37e96bb3f59451dbeb5..b6bd26110dfead7736dc295bc782c09f60f611d1 100644 (file)
--- a/daemon/client.h
+++ b/daemon/client.h
@@ -28,16 +28,7 @@ struct daemon_client {
        struct ctrlproxyd_config *config;
        gboolean (*socks_accept_fn) (struct pending_client *, gboolean);
        struct pending_client *pending_client;
-       struct {
-               char *password;
-               char *servername;
-               char *servicename;
-               char *nick;
-               char *username;
-               char *mode;
-               char *unused;
-               char *realname;
-       } credentials;
+       struct login_details *login_details;
        char *description;
        gboolean freed;
        gboolean inetd;

diff --git a/daemon/daemon.h b/daemon/daemon.h
index 3941c47c29a86b3e4f707c4e4eef0935e55e57ad..bb920f1cefd6372524c75309a05479ad5f79268e 100644 (file)
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -27,4 +27,15 @@ struct ctrlproxyd_config {
        char *configdir;
 };
 
+struct login_details {
+       char *password;
+       char *servername;
+       char *servicename;
+       char *nick;
+       char *username;
+       char *mode;
+       char *unused;
+       char *realname;
+};
+
 #endif

diff --git a/daemon/main.c b/daemon/main.c
index e4363399eec3f79eec6337cf981078afb7a3d0e2..5085f16d21f13146828663a092686b7fe4faa134 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -186,7 +186,7 @@ static gboolean daemon_socks_gssapi (struct pending_client *pc, gss_name_t usern
        gss_buffer_desc namebuf;
 
        namebuf.value = NULL;
-       namebuf.length = 0;
+       namebuf.length = 0
 
        major_status = gss_export_name(&minor_status, username, &namebuf);
        if (GSS_ERROR(major_status)) {
@@ -217,6 +217,7 @@ static gboolean backend_error(struct daemon_backend *backend, const char *error_
 static void backend_disconnect(struct daemon_backend *backend)
 {
        struct daemon_client *cd = backend->userdata;
+
        listener_log(LOG_INFO, cd->listener, "Backend of %s disconnected", cd->description);
 
        daemon_client_kill(cd);
@@ -225,6 +226,7 @@ static void backend_disconnect(struct daemon_backend *backend)
 static gboolean backend_recv(struct daemon_backend *backend, const struct irc_line *line)
 {
        struct daemon_client *cd = backend->userdata;
+
        return transport_send_line(cd->client_transport, line);
 }
 
@@ -284,8 +286,8 @@ static gboolean daemon_socks_connect_fqdn (struct pending_client *cl, const char
 
        /* Only called after authentication */
 
-       cd->credentials.servername = g_strdup(hostname);
-       cd->credentials.servicename = g_strdup_printf("%d", port);
+       cd->login_details->servername = g_strdup(hostname);
+       cd->login_details->servicename = g_strdup_printf("%d", port);
 
        cd->description = g_io_channel_ip_get_description(cl->connection);
        listener_log(LOG_INFO, cl->listener, "Accepted new client %s for user %s", cd->description, cd->user->username);
@@ -322,17 +324,17 @@ static gboolean handle_client_line(struct pending_client *pc, const struct irc_l
        }
 
        if (!g_strcasecmp(l->args[0], "PASS")) {
-               cd->credentials.password = g_strdup(l->args[1]);
+               cd->login_details->password = g_strdup(l->args[1]);
        } else if (!g_strcasecmp(l->args[0], "CONNECT")) {
-               cd->credentials.servername = g_strdup(l->args[1]);
-               cd->credentials.servicename = g_strdup(l->args[2]);
+               cd->login_details->servername = g_strdup(l->args[1]);
+               cd->login_details->servicename = g_strdup(l->args[2]);
        } else if (!g_strcasecmp(l->args[0], "USER") && l->argc > 4) {
-               cd->credentials.username = g_strdup(l->args[1]);
-               cd->credentials.mode = g_strdup(l->args[2]);
-               cd->credentials.unused = g_strdup(l->args[3]);
-               cd->credentials.realname = g_strdup(l->args[4]);
+               cd->login_details->username = g_strdup(l->args[1]);
+               cd->login_details->mode = g_strdup(l->args[2]);
+               cd->login_details->unused = g_strdup(l->args[3]);
+               cd->login_details->realname = g_strdup(l->args[4]);
        } else if (!g_strcasecmp(l->args[0], "NICK")) {
-               cd->credentials.nick = g_strdup(l->args[1]);
+               cd->login_details->nick = g_strdup(l->args[1]);
        } else if (!g_strcasecmp(l->args[0], "QUIT")) {
                return FALSE;
        } else {
@@ -341,8 +343,8 @@ static gboolean handle_client_line(struct pending_client *pc, const struct irc_l
                g_io_channel_flush(pc->connection, NULL);
        }
 
-       if (cd->credentials.username != NULL && cd->credentials.password != NULL && cd->credentials.nick != NULL) {
-               if (!daemon_client_connect_backend(cd, pc, cd->credentials.username))
+       if (cd->login_details->username != NULL && cd->login_details->password != NULL && cd->login_details->nick != NULL) {
+               if (!daemon_client_connect_backend(cd, pc, cd->login_details->username))
                        return FALSE;
 
                cd->description = g_io_channel_ip_get_description(pc->connection);
@@ -350,7 +352,7 @@ static gboolean handle_client_line(struct pending_client *pc, const struct irc_l
 
                cd->client_transport = irc_transport_new_iochannel(pc->connection);
 
-               daemon_backend_authenticate(cd->backend, cd->credentials.password, plain_handle_auth_finish);
+               daemon_backend_authenticate(cd->backend, cd->login_details->password, plain_handle_auth_finish);
 
                irc_transport_set_callbacks(cd->client_transport, &daemon_client_callbacks, cd);
 
@@ -365,6 +367,7 @@ static gboolean handle_client_line(struct pending_client *pc, const struct irc_l
 static void daemon_new_client(struct pending_client *pc)
 {
        struct daemon_client *cd = g_new0(struct daemon_client, 1);
+       cd->login_details = g_new0(struct login_details, 1);
        cd->listener = pc->listener;
        cd->config = global_daemon_config;
        pc->private_data = cd;