Attachment 619696 Details for Bug 861892 – add --with-winbind-socket-dir option

[patch] add --with-winbind-socket-dir option

0001-Add-with-winbindd-socket-dir.patch (text/plain), 3.41 KB, created by Alexander Bokovoy on 2012-10-01 09:17:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Bokovoy

Created: 2012-10-01 09:17:15 UTC

Size: 3.41 KB

patch

obsolete

>From 99b490ac790ed79436edc7cfd0726480b31a4caa Mon Sep 17 00:00:00 2001
>From: Alexander Bokovoy <abokovoy@redhat.com>
>Date: Sun, 30 Sep 2012 20:34:11 +0300
>Subject: [PATCH] Add --with-winbindd-socket-dir
>
>---
> ...nbindd-socket-dir-to-allow-coexisting-s3-.patch | 25 ++++++++++++++++++++++
> samba4.spec                                        |  9 +++++++-
> 2 files changed, 33 insertions(+), 1 deletion(-)
> create mode 100644 samba-4.0.0rc2-add-with-winbindd-socket-dir-to-allow-coexisting-s3-.patch
>
>diff --git a/samba-4.0.0rc2-add-with-winbindd-socket-dir-to-allow-coexisting-s3-.patch b/samba-4.0.0rc2-add-with-winbindd-socket-dir-to-allow-coexisting-s3-.patch
>new file mode 100644
>index 0000000000000000000000000000000000000000..77252ef51aa55ba6261cece9ba28bb6ccd2a4a8c
>--- /dev/null
>+++ b/samba-4.0.0rc2-add-with-winbindd-socket-dir-to-allow-coexisting-s3-.patch
>@@ -0,0 +1,25 @@
>+From f3d6d067dee274952354ad112a561bf221c19e52 Mon Sep 17 00:00:00 2001
>+From: Alexander Bokovoy <ab@samba.org>
>+Date: Fri, 28 Sep 2012 16:36:20 +0300
>+Subject: [PATCH 6/6] add --with-winbindd-socket-dir to allow coexisting s3/s4
>+ install
>+
>+---
>+ dynconfig/wscript | 1 +
>+ 1 file changed, 1 insertion(+)
>+
>+diff --git a/dynconfig/wscript b/dynconfig/wscript
>+index 44e8f19f73278bc653875cfbef8e2dc8b3da4f47..2b3d61357198dc7325be6cc5956274412041ed4b 100755
>+--- a/dynconfig/wscript
>++++ b/dynconfig/wscript
>+@@ -213,6 +213,7 @@ dynconfig = {
>+     'WINBINDD_SOCKET_DIR' : {
>+          'STD-PATH':  '${SOCKET_DIR}/winbindd',
>+          'FHS-PATH':  '${SOCKET_DIR}/winbindd',
>++         'OPTION':    '--with-winbindd-socket-dir',
>+          'DELAY':     True,
>+     },
>+     'WINBINDD_PRIVILEGED_SOCKET_DIR' : {
>+-- 
>+1.7.12
>+
>diff --git a/samba4.spec b/samba4.spec
>index a433e6f34cb569eb65f8c3623a57ce0f864886b2..875aaaa0178ae4b48389542e7162f2ffa531fc19 100644
>--- a/samba4.spec
>+++ b/samba4.spec
>@@ -1,4 +1,4 @@
>-%define main_release 29
>+%define main_release 30
> 
> %define samba_version 4.0.0
> %define talloc_version 2.0.7
>@@ -74,6 +74,7 @@ Patch4: samba-4.0.0rc2-fix_smbldaphelper_without_ldap.patch
> Patch5: samba-4.0.0rc2-fix_smb.conf_manpage_build.patch
> Patch6: samba-4.0.0rc2-use_smb_man_style.patch
> Patch7: samba-4.0.0rc2-fix_panic_action.patch
>+Patch8: samba-4.0.0rc2-add-with-winbindd-socket-dir-to-allow-coexisting-s3-.patch
> 
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
>@@ -376,6 +377,7 @@ link against the SMB, RPC and other protocols.
> %patch5 -p1 -b .smb.conf_manpage
> %patch6 -p1 -b .smb_man_style
> %patch7 -p1 -b .fix_panic_action
>+%patch8 -p1 -b .winbindd_socket_dir
> 
> %build
> %global _talloc_lib ,talloc,pytalloc,pytalloc-util
>@@ -436,6 +438,7 @@ CFLAGS="-fno-strict-aliasing %{optflags}" CXXFLAGS="-fno-strict-aliasing %{optfl
>         --enable-fhs \
>         --with-piddir=/var/run \
>         --with-sockets-dir=/var/run/samba \
>+        --with-winbindd-socket-dir=/var/run \
>         --with-modulesdir=%{_libdir}/samba \
>         --with-pammodulesdir=/%{smb_lib}/security \
>         --with-lockdir=/var/lib/samba \
>@@ -1271,6 +1274,10 @@ rm -rf %{buildroot}
> %endif # with_libwbclient
> 
> %changelog
>+* Fri Sep 28 2012 - Alexander Bokovoy <abokovoy@redhat.com> - 4.0.0-30.rc1
>+- Add --with-winbindd-socket-dir to allow coexisting samba3/samba4
>+  winbind use (libwbclient is built from samba3, winbindd from samba4)
>+
> * Tue Sep 25 2012 - Andreas Schneider <asn@redhat.com> - 4.0.0-29.rc1
> - Fix Requires and Conflicts.
> - related: #766333
>-- 
>1.7.12
>

Actions: View | Diff

Attachments on bug 861892: 619696