Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP4:Update
adcli.19060
0028-tools-add-option-add-samba-data.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0028-tools-add-option-add-samba-data.patch of Package adcli.19060
From 935eba15826568dcabbff69a6a3722365fec7952 Mon Sep 17 00:00:00 2001 From: Sumit Bose <sbose@redhat.com> Date: Tue, 30 Jan 2018 14:46:00 +0100 Subject: [PATCH 28/34] tools: add option --add-samba-data https://bugs.freedesktop.org/show_bug.cgi?id=100118 https://gitlab.freedesktop.org/realmd/adcli/issues/6 Reviewed-by: Jakub Hrozek <jhrozek@redhat.com> (cherry picked from commit 9e2be6f374d6d9107a34acfcd6fa551190d756d5) --- doc/adcli.xml | 30 ++++++++++++++++++++++++++++++ library/adenroll.h | 1 + tools/computer.c | 12 ++++++++++++ 3 files changed, 43 insertions(+) diff --git a/doc/adcli.xml b/doc/adcli.xml index f257c88..fbbe639 100644 --- a/doc/adcli.xml +++ b/doc/adcli.xml @@ -335,6 +335,21 @@ Password for Administrator: machine account password. This is output in a format that should be both human and machine readable.</para></listitem> </varlistentry> + <varlistentry> + <term><option>--add-samba-data</option></term> + <listitem><para>After a successful join add the domain + SID and the machine account password to the Samba + specific databases by calling Samba's + <command>net</command> utility.</para> + + <para>Please note that Samba's <command>net</command> + requires some settings in <filename>smb.conf</filename> + to create the database entries correctly. Most + important here is currently the + <option>workgroup</option> option, see + <citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details.</para></listitem> + </varlistentry> </variablelist> </refsect1> @@ -445,6 +460,21 @@ $ adcli update --login-ccache=/tmp/krbcc_123 about join operation. This is output in a format that should be both human and machine readable.</para></listitem> </varlistentry> + <varlistentry> + <term><option>--add-samba-data</option></term> + <listitem><para>After a successful join add the domain + SID and the machine account password to the Samba + specific databases by calling Samba's + <command>net</command> utility.</para> + + <para>Please note that Samba's <command>net</command> + requires some settings in <filename>smb.conf</filename> + to create the database entries correctly. Most + important here is currently the + <option>workgroup</option> option, see + <citerefentry><refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details.</para></listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/library/adenroll.h b/library/adenroll.h index 5a24c42..438216e 100644 --- a/library/adenroll.h +++ b/library/adenroll.h @@ -30,6 +30,7 @@ typedef enum { ADCLI_ENROLL_NO_KEYTAB = 1 << 1, ADCLI_ENROLL_ALLOW_OVERWRITE = 1 << 2, ADCLI_ENROLL_PASSWORD_VALID = 1 << 3, + ADCLI_ENROLL_ADD_SAMBA_DATA = 1 << 3, } adcli_enroll_flags; typedef struct _adcli_enroll adcli_enroll; diff --git a/tools/computer.c b/tools/computer.c index bb77963..868bb60 100644 --- a/tools/computer.c +++ b/tools/computer.c @@ -106,6 +106,7 @@ typedef enum { opt_os_service_pack, opt_user_principal, opt_computer_password_lifetime, + opt_add_samba_data, opt_trusted_for_delegation, opt_add_service_principal, opt_remove_service_principal, @@ -151,6 +152,8 @@ static adcli_tool_desc common_usages[] = { "a successful join" }, { opt_show_password, "show computer account password after after a\n" "successful join" }, + { opt_add_samba_data, "add domain SID and computer account password\n" + "to the Samba specific configuration database" }, { opt_verbose, "show verbose progress and failure messages", }, { 0 }, }; @@ -294,6 +297,7 @@ parse_option (Option opt, case opt_show_details: case opt_show_password: case opt_one_time_password: + case opt_add_samba_data: assert (0 && "not reached"); break; } @@ -354,6 +358,7 @@ adcli_tool_computer_join (adcli_conn *conn, { "add-service-principal", required_argument, NULL, opt_add_service_principal }, { "show-details", no_argument, NULL, opt_show_details }, { "show-password", no_argument, NULL, opt_show_password }, + { "add-samba-data", no_argument, NULL, opt_add_samba_data }, { "verbose", no_argument, NULL, opt_verbose }, { "help", no_argument, NULL, 'h' }, { 0 }, @@ -380,6 +385,9 @@ adcli_tool_computer_join (adcli_conn *conn, case opt_show_password: show_password = 1; break; + case opt_add_samba_data: + flags |= ADCLI_ENROLL_ADD_SAMBA_DATA; + break; case 'h': case '?': case ':': @@ -456,6 +464,7 @@ adcli_tool_computer_update (adcli_conn *conn, { "remove-service-principal", required_argument, NULL, opt_remove_service_principal }, { "show-details", no_argument, NULL, opt_show_details }, { "show-password", no_argument, NULL, opt_show_password }, + { "add-samba-data", no_argument, NULL, opt_add_samba_data }, { "verbose", no_argument, NULL, opt_verbose }, { "help", no_argument, NULL, 'h' }, { 0 }, @@ -478,6 +487,9 @@ adcli_tool_computer_update (adcli_conn *conn, case opt_show_password: show_password = 1; break; + case opt_add_samba_data: + flags |= ADCLI_ENROLL_ADD_SAMBA_DATA; + break; case 'h': case '?': case ':': -- 2.25.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
