Attachment 14261 Details for Bug 13489 – patch for 4.8

[patch] patch for 4.8

v4-8-test-localauth.patch (text/plain), 9.49 KB, created by Andreas Schneider on 2018-06-27 19:28:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2018-06-27 19:28:35 UTC

Size: 9.49 KB

patch

obsolete

>From 725bfdbd29d6910b07bb15dbd44376dc4b4accbd Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 27 Jun 2018 14:06:39 +0200
>Subject: [PATCH 1/4] krb5_plugin: Install plugins to krb5 modules dir
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit eba2eb8a15c7a25b1436907a5339241492c81097)
>---
> nsswitch/wscript_build | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
>index 15e93db2f05..576855bb56c 100644
>--- a/nsswitch/wscript_build
>+++ b/nsswitch/wscript_build
>@@ -105,16 +105,18 @@ if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
> 		)
> 
> if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
>-	bld.SAMBA_LIBRARY('winbind_krb5_locator',
>-		source='winbind_krb5_locator.c',
>-		deps='wbclient krb5 com_err',
>-		realname='winbind_krb5_locator.so')
>+    bld.SAMBA_LIBRARY('winbind_krb5_locator',
>+                      source='winbind_krb5_locator.c',
>+                      deps='wbclient krb5 com_err',
>+                      realname='winbind_krb5_locator.so',
>+                      install_path='${MODULESDIR}/krb5')
> 
> if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
>     bld.SAMBA_LIBRARY('winbind_krb5_localauth',
>                       source='krb5_plugin/winbind_krb5_localauth.c',
>                       deps='wbclient krb5 com_err',
>-                      realname='winbind-krb5-localauth.so')
>+                      realname='winbind_krb5_localauth.so',
>+                      install_path='${MODULESDIR}/krb5')
> 
> bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
> 	source='wb_reqtrans.c',
>-- 
>2.17.1
>
>
>From bf7cb6965d34b6a6129008bf1ad703c5fc67761d Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 27 Jun 2018 14:08:56 +0200
>Subject: [PATCH 2/4] krb5_plugin: Move krb5 locator plugin to krb5_plugin
> subdir
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit 4a7e0f259bb7f1ebce48523767262addda08fe14)
>---
> nsswitch/{ => krb5_plugin}/winbind_krb5_locator.c | 0
> nsswitch/wscript_build                            | 2 +-
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename nsswitch/{ => krb5_plugin}/winbind_krb5_locator.c (100%)
>
>diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/krb5_plugin/winbind_krb5_locator.c
>similarity index 100%
>rename from nsswitch/winbind_krb5_locator.c
>rename to nsswitch/krb5_plugin/winbind_krb5_locator.c
>diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
>index 576855bb56c..dd1952b799b 100644
>--- a/nsswitch/wscript_build
>+++ b/nsswitch/wscript_build
>@@ -106,7 +106,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
> 
> if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
>     bld.SAMBA_LIBRARY('winbind_krb5_locator',
>-                      source='winbind_krb5_locator.c',
>+                      source='krb5_plugin/winbind_krb5_locator.c',
>                       deps='wbclient krb5 com_err',
>                       realname='winbind_krb5_locator.so',
>                       install_path='${MODULESDIR}/krb5')
>-- 
>2.17.1
>
>
>From f44bd21e905bd4e3ed1d9c29330fe8d4e7bd9429 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 27 Jun 2018 15:14:15 +0200
>Subject: [PATCH 3/4] docs: Move winbind_krb5_locator manpage to volume 8
>
>The vfs and idmap manpages are in volume 8 too.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit 6b7fcec01524ea1c4f2d923cc9cc2c17af3c3a21)
>---
> ...inbind_krb5_locator.7.xml => winbind_krb5_locator.8.xml} | 6 +++---
> docs-xml/wscript_build                                      | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
> rename docs-xml/manpages/{winbind_krb5_locator.7.xml => winbind_krb5_locator.8.xml} (96%)
>
>diff --git a/docs-xml/manpages/winbind_krb5_locator.7.xml b/docs-xml/manpages/winbind_krb5_locator.8.xml
>similarity index 96%
>rename from docs-xml/manpages/winbind_krb5_locator.7.xml
>rename to docs-xml/manpages/winbind_krb5_locator.8.xml
>index 17e401a9da0..0af0c2cc95f 100644
>--- a/docs-xml/manpages/winbind_krb5_locator.7.xml
>+++ b/docs-xml/manpages/winbind_krb5_locator.8.xml
>@@ -1,12 +1,12 @@
> <?xml version="1.0" encoding="iso-8859-1"?>
> <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
>-<refentry id="winbind_krb5_locator.7">
>+<refentry id="winbind_krb5_locator.8">
> 
> <refmeta>
> 	<refentrytitle>winbind_krb5_locator</refentrytitle>
>-	<manvolnum>7</manvolnum>
>+	<manvolnum>8</manvolnum>
> 	<refmiscinfo class="source">Samba</refmiscinfo>
>-	<refmiscinfo class="manual">7</refmiscinfo>
>+	<refmiscinfo class="manual">8</refmiscinfo>
> 	<refmiscinfo class="version">&doc.version;</refmiscinfo>
> </refmeta>
> 
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index 954c62a29bc..2d686eb38b0 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -103,7 +103,7 @@ pam_winbind_manpages = '''
>                        manpages/pam_winbind.conf.5
>                        '''
> 
>-krb5_locator_manpages = 'manpages/winbind_krb5_locator.7'
>+krb5_locator_manpages = 'manpages/winbind_krb5_locator.8'
> 
> def smbdotconf_generate_parameter_list(task):
>     parameter_all = task.outputs[0].bldpath(task.env)
>-- 
>2.17.1
>
>
>From a71e6fa7f4c1c99e5b7c4106b67dc42365d9a958 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 27 Jun 2018 15:06:07 +0200
>Subject: [PATCH 4/4] docs: Add manpage for winbind_krb5_localauth.8
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13489
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Wed Jun 27 18:45:56 CEST 2018 on sn-devel-144
>
>(cherry picked from commit e88d68c253b4398eaed701d1a9bcc1b83882e127)
>---
> .../manpages/winbind_krb5_localauth.8.xml     | 86 +++++++++++++++++++
> docs-xml/wscript_build                        |  4 +
> 2 files changed, 90 insertions(+)
> create mode 100644 docs-xml/manpages/winbind_krb5_localauth.8.xml
>
>diff --git a/docs-xml/manpages/winbind_krb5_localauth.8.xml b/docs-xml/manpages/winbind_krb5_localauth.8.xml
>new file mode 100644
>index 00000000000..a382e71ead3
>--- /dev/null
>+++ b/docs-xml/manpages/winbind_krb5_localauth.8.xml
>@@ -0,0 +1,86 @@
>+<?xml version="1.0" encoding="iso-8859-1"?>
>+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
>+<refentry id="winbind_krb5_localauth.8">
>+
>+<refmeta>
>+	<refentrytitle>winbind_krb5_localauth</refentrytitle>
>+	<manvolnum>8</manvolnum>
>+	<refmiscinfo class="source">Samba</refmiscinfo>
>+	<refmiscinfo class="manual">8</refmiscinfo>
>+	<refmiscinfo class="version">&doc.version;</refmiscinfo>
>+</refmeta>
>+
>+
>+<refnamediv>
>+	<refname>winbind_krb5_localauth</refname>
>+	<refpurpose>A plugin for MIT Kerberos for mapping user accounts.</refpurpose>
>+</refnamediv>
>+
>+
>+<refsect1>
>+	<title>DESCRIPTION</title>
>+
>+	<para>
>+		This plugin is part of the
>+		<citerefentry><refentrytitle>samba</refentrytitle>
>+		<manvolnum>7</manvolnum></citerefentry> suite.
>+	</para>
>+
>+	<para>
>+		<command>winbind_krb5_localauth</command> is a plugin that
>+		permits the MIT Kerberos libraries that Kerberos principals can
>+		be validated against local user accounts.
>+	</para>
>+</refsect1>
>+<refsect1>
>+	<title>PREREQUISITES</title>
>+	<para>
>+		MIT Kerberos (at least version 1.12) is required.
>+	</para>
>+
>+	<para>
>+		The plugin queries the <citerefentry><refentrytitle>winbindd</refentrytitle>
>+		<manvolnum>8</manvolnum></citerefentry> daemon which needs to be configured
>+		and started separately.
>+	</para>
>+
>+	<para>
>+		The following sections needs to be added to the
>+		<filename>krb5.conf</filename> file.
>+
>+		<programlisting>
>+[plugins]
>+	localauth = {
>+		module = winbind:/usr/lib64/samba/krb5/winbind_krb5_localauth.so
>+		enable_only = winbind
>+	}
>+		</programlisting>
>+	</para>
>+</refsect1>
>+
>+<refsect1>
>+	<title>VERSION</title>
>+
>+	<para>
>+		This man page is part of version &doc.version; of the Samba
>+		suite.
>+	</para>
>+</refsect1>
>+
>+<refsect1>
>+	<title>AUTHOR</title>
>+
>+	<para>
>+		The original Samba software and related utilities were created
>+		by Andrew Tridgell. Samba is now developed by the Samba Team as
>+		an Open Source project similar to the way the Linux kernel is
>+		developed.
>+	</para>
>+
>+	<para>
>+		The winbind_krb5_localauth manpage was written by Andreas
>+		Schneider.
>+	</para>
>+</refsect1>
>+
>+</refentry>
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index 2d686eb38b0..ec5d28fc62a 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -104,6 +104,7 @@ pam_winbind_manpages = '''
>                        '''
> 
> krb5_locator_manpages = 'manpages/winbind_krb5_locator.8'
>+krb5_localauth_manpages = 'manpages/winbind_krb5_localauth.8'
> 
> def smbdotconf_generate_parameter_list(task):
>     parameter_all = task.outputs[0].bldpath(task.env)
>@@ -162,5 +163,8 @@ if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
>     if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
>         bld.SAMBAMANPAGES(krb5_locator_manpages)
> 
>+    if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
>+        bld.SAMBAMANPAGES(krb5_localauth_manpages)
>+
>     if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
>         bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
>-- 
>2.17.1
>

Flags:

ab: review+

Actions: View

Attachments on bug 13489: 14261