|
 |
8e731f |
From 92087e73c87b4afc01c32f572d202919cac09d41 Mon Sep 17 00:00:00 2001
|
|
|
8e731f |
From: Andrew Austin <aaustin@one.verizon.com>
|
|
|
8e731f |
Date: Sun, 17 Apr 2016 12:52:15 -0500
|
|
|
8e731f |
Subject: [PATCH 2/3] Add computer-name support to realm join CLI
|
|
|
8e731f |
|
|
|
8e731f |
This exposes the computer-name option on the CLI for use
|
|
|
8e731f |
when joining an active directory domain.
|
|
|
8e731f |
|
|
|
8e731f |
https://bugs.freedesktop.org/show_bug.cgi?id=93739
|
|
|
8e731f |
|
|
|
8e731f |
Signed-off-by: Stef Walter <stefw@redhat.com>
|
|
|
8e731f |
* Squashed fixup patch
|
|
|
8e731f |
---
|
|
|
8e731f |
tools/realm-join.c | 5 +++++
|
|
|
8e731f |
1 file changed, 5 insertions(+)
|
|
|
8e731f |
|
|
|
8e731f |
diff --git a/tools/realm-join.c b/tools/realm-join.c
|
|
|
8e731f |
index feb6edc..3685bb9 100644
|
|
|
8e731f |
--- a/tools/realm-join.c
|
|
|
8e731f |
+++ b/tools/realm-join.c
|
|
|
8e731f |
@@ -168,6 +168,7 @@ perform_user_join (RealmClient *client,
|
|
|
8e731f |
typedef struct {
|
|
|
8e731f |
gchar *user;
|
|
|
8e731f |
gchar *computer_ou;
|
|
|
8e731f |
+ gchar *computer_name;
|
|
|
8e731f |
gchar *client_software;
|
|
|
8e731f |
gchar *server_software;
|
|
|
8e731f |
gchar *membership_software;
|
|
|
8e731f |
@@ -184,6 +185,7 @@ realm_join_args_clear (gpointer data)
|
|
|
8e731f |
RealmJoinArgs *args = data;
|
|
|
8e731f |
g_free (args->user);
|
|
|
8e731f |
g_free (args->computer_ou);
|
|
|
8e731f |
+ g_free (args->computer_name);
|
|
|
8e731f |
g_free (args->client_software);
|
|
|
8e731f |
g_free (args->server_software);
|
|
|
8e731f |
g_free (args->user_principal);
|
|
|
8e731f |
@@ -238,6 +240,7 @@ perform_join (RealmClient *client,
|
|
|
8e731f |
}
|
|
|
8e731f |
|
|
|
8e731f |
options = realm_build_options (REALM_DBUS_OPTION_COMPUTER_OU, args->computer_ou,
|
|
|
8e731f |
+ REALM_DBUS_OPTION_COMPUTER_NAME, args->computer_name,
|
|
|
8e731f |
REALM_DBUS_OPTION_MEMBERSHIP_SOFTWARE, args->membership_software,
|
|
|
8e731f |
REALM_DBUS_OPTION_USER_PRINCIPAL, args->user_principal,
|
|
|
8e731f |
args->automatic_id_mapping_set ?
|
|
|
8e731f |
@@ -283,6 +286,8 @@ realm_join (RealmClient *client,
|
|
|
8e731f |
N_("User name to use for enrollment"), NULL },
|
|
|
8e731f |
{ "computer-ou", 0, 0, G_OPTION_ARG_STRING, &args.computer_ou,
|
|
|
8e731f |
N_("Computer OU DN to join"), NULL },
|
|
|
8e731f |
+ { "computer-name", 0, 0, G_OPTION_ARG_STRING, &args.computer_name,
|
|
|
8e731f |
+ N_("Use specific computer name instead of hostname"), NULL },
|
|
|
8e731f |
{ "client-software", 0, 0, G_OPTION_ARG_STRING, &args.client_software,
|
|
|
8e731f |
N_("Use specific client software"), NULL },
|
|
|
8e731f |
{ "server-software", 0, 0, G_OPTION_ARG_STRING, &args.server_software,
|
|
|
8e731f |
--
|
|
|
8e731f |
2.7.4
|
|
|
8e731f |
|