From 92087e73c87b4afc01c32f572d202919cac09d41 Mon Sep 17 00:00:00 2001
From: Andrew Austin <aaustin@one.verizon.com>
Date: Sun, 17 Apr 2016 12:52:15 -0500
Subject: [PATCH 2/3] Add computer-name support to realm join CLI

This exposes the computer-name option on the CLI for use
when joining an active directory domain.

https://bugs.freedesktop.org/show_bug.cgi?id=93739

Signed-off-by: Stef Walter <stefw@redhat.com>
 * Squashed fixup patch
---
 tools/realm-join.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/realm-join.c b/tools/realm-join.c
index feb6edc..3685bb9 100644
--- a/tools/realm-join.c
+++ b/tools/realm-join.c
@@ -168,6 +168,7 @@ perform_user_join (RealmClient *client,
 typedef struct {
 	gchar *user;
 	gchar *computer_ou;
+	gchar *computer_name;
 	gchar *client_software;
 	gchar *server_software;
 	gchar *membership_software;
@@ -184,6 +185,7 @@ realm_join_args_clear (gpointer data)
 	RealmJoinArgs *args = data;
 	g_free (args->user);
 	g_free (args->computer_ou);
+	g_free (args->computer_name);
 	g_free (args->client_software);
 	g_free (args->server_software);
 	g_free (args->user_principal);
@@ -238,6 +240,7 @@ perform_join (RealmClient *client,
 	}
 
 	options = realm_build_options (REALM_DBUS_OPTION_COMPUTER_OU, args->computer_ou,
+	                               REALM_DBUS_OPTION_COMPUTER_NAME, args->computer_name,
 	                               REALM_DBUS_OPTION_MEMBERSHIP_SOFTWARE, args->membership_software,
 	                               REALM_DBUS_OPTION_USER_PRINCIPAL, args->user_principal,
 	                               args->automatic_id_mapping_set ?
@@ -283,6 +286,8 @@ realm_join (RealmClient *client,
 		  N_("User name to use for enrollment"), NULL },
 		{ "computer-ou", 0, 0, G_OPTION_ARG_STRING, &args.computer_ou,
 		  N_("Computer OU DN to join"), NULL },
+		{ "computer-name", 0, 0, G_OPTION_ARG_STRING, &args.computer_name,
+			N_("Use specific computer name instead of hostname"), NULL },
 		{ "client-software", 0, 0, G_OPTION_ARG_STRING, &args.client_software,
 		  N_("Use specific client software"), NULL },
 		{ "server-software", 0, 0, G_OPTION_ARG_STRING, &args.server_software,
-- 
2.7.4