[samba/f18] Add a Networkmanager dispatcher script for winbind.

asn asn at fedoraproject.org
Fri Oct 26 12:53:24 UTC 2012


commit c43d8fc4afa80aceb54301caa97e51305e029d8b
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Fri Oct 26 14:36:59 2012 +0200

    Add a Networkmanager dispatcher script for winbind.

 samba.spec             |    8 +++++++-
 winbind.networkmanager |   20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index 2111d14..8d5c267 100644
--- a/samba.spec
+++ b/samba.spec
@@ -58,6 +58,7 @@ Source3: swat.desktop
 Source4: smb.conf.default
 Source5: pam_winbind.conf
 Source6: samba.conf.tmp
+Source7: winbind.networkmanager
 
 Source100: smbprint
 
@@ -561,6 +562,10 @@ for i in nmb smb winbind ; do
     install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
 done
 
+# FIXME use packaging/NetworkManager/30-winbind
+install -d -m 0755 %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/
+install -m 0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/30-winbind
+
 # winbind krb5 locator
 install -d -m 0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
@@ -1288,9 +1293,9 @@ rm -rf %{buildroot}
 %{_sbindir}/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
 %{_unitdir}/winbind.service
+%{_sysconfdir}/NetworkManager/dispatcher.d/30-winbind
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/idmap_*.8*
-#%{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
 
 ### WINBIND-CLIENTS
 %files winbind-clients
@@ -1317,6 +1322,7 @@ rm -rf %{buildroot}
 %changelog
 * Fri Oct 26 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-161.rc3
 - Add missing Requries for python modules.
+- Add NetworkManager dispatcher script for winbind.
 
 * Fri Oct 19 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-160.rc3
 - resolves: #867893 - Move /var/log/samba to samba-common package for
diff --git a/winbind.networkmanager b/winbind.networkmanager
new file mode 100755
index 0000000..af0edf9
--- /dev/null
+++ b/winbind.networkmanager
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+winbind_is_active=$(/bin/systemctl is-active winbind.service)
+test "${winbind_is_active}" = "active" || exit 0
+
+winbind_offline_logon=$(testparm -s --parameter-name "winbind offline logon" 2>/dev/null)
+test "${winbind_offline_logon}" = "Yes" || exit 0
+
+case "$2" in
+	up|vpn-up)
+		nmb_is_active=$(/bin/systemctl is-active nmb.service)
+		if test "${nmb_is_active}" = "active"; then
+			/bin/systemctl try-restart nmb.service || :
+		fi
+		/usr/bin/smbcontrol winbind online || :
+	;;
+	down)
+		/usr/bin/smbcontrol winbind offline
+	;;
+esac


More information about the scm-commits mailing list