[Pkg-sssd-devel] [Git][sssd-team/sssd][ubuntu-cosmic] GPO: Allow customization of GPO_CROND per OS

[Victor Tapia]

Victor Tapia pushed to branch ubuntu-cosmic at Debian SSSD packaging / sssd


Commits:
42b041a1 by Victor Tapia at 2019-02-28T08:24:59Z
GPO: Allow customization of GPO_CROND per OS

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/GPO_CROND-customization.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+sssd (1.16.3-1ubuntu3) cosmic; urgency=medium
+
+  * d/p/GPO_CROND-customization.diff: Set GPO_CROND to cron instead of
+    crond for Debian and Ubuntu (LP: #1572908)
+
+ -- Victor Tapia <victor.tapia at canonical.com>  Wed, 27 Feb 2019 15:57:53 +0100
+
 sssd (1.16.3-1ubuntu2) cosmic; urgency=medium
 
   * Don't require libgdm-dev on s390x or non-Linux architectures


=====================================
debian/patches/GPO_CROND-customization.diff
=====================================
@@ -0,0 +1,61 @@
+From bc65ba9a07a924a58b13a0d5a935114ab72b7524 Mon Sep 17 00:00:00 2001
+From: Victor Tapia <victor.tapia at canonical.com>
+Date: Fri, 22 Feb 2019 14:54:13 +0100
+Subject: [PATCH] GPO: Allow customization of GPO_CROND per OS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For both Debian and Ubuntu, the cron PAM service is named "cron" instead
+of "crond", denying the use of the service by default.
+
+This patch enables the HAVE_$OS (HAVE_DEBIAN/HAVE_FEDORA...) macros to select
+the service name during build, allowing further customization if required.
+
+Resolves:
+https://bugs.launchpad.net/ubuntu/+source/sssd/+bug/1572908
+
+Reviewed-by: Michal Židek <mzidek at redhat.com>
+---
+ src/external/platform.m4  | 8 ++++++++
+ src/providers/ad/ad_gpo.c | 4 ++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/external/platform.m4 b/src/external/platform.m4
+index c67e08144..75853622f 100644
+--- a/src/external/platform.m4
++++ b/src/external/platform.m4
+@@ -36,6 +36,14 @@ AM_CONDITIONAL([HAVE_SUSE], [test x"$osname" = xsuse])
+ AM_CONDITIONAL([HAVE_DEBIAN], [test x"$osname" = xdebian])
+ AM_CONDITIONAL([HAVE_GENTOO], [test x"$osname" = xgentoo])
+ 
++AS_CASE([$osname],
++        [redhat], [AC_DEFINE_UNQUOTED([HAVE_REDHAT], 1, [Build with redhat config])],
++        [fedora], [AC_DEFINE_UNQUOTED([HAVE_FEDORA], 1, [Build with fedora config])],
++        [suse], [AC_DEFINE_UNQUOTED([HAVE_SUSE], 1, [Build with suse config])],
++        [gentoo], [AC_DEFINE_UNQUOTED([HAVE_GENTOO], 1, [Build with gentoo config])],
++        [debian], [AC_DEFINE_UNQUOTED([HAVE_DEBIAN], 1, [Build with debian config])],
++        [AC_MSG_NOTICE([Build with $osname config])])
++
+ AC_CHECK_MEMBERS([struct ucred.pid, struct ucred.uid, struct ucred.gid], , ,
+                  [[#include <sys/socket.h>]])
+ 
+diff --git a/src/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c
+index f3be7238e..3b472e0e9 100644
+--- a/src/providers/ad/ad_gpo.c
++++ b/src/providers/ad/ad_gpo.c
+@@ -200,7 +200,11 @@ int ad_gpo_process_cse_recv(struct tevent_req *req);
+ #define GPO_SSHD "sshd"
+ #define GPO_FTP "ftp"
+ #define GPO_SAMBA "samba"
++#ifdef HAVE_DEBIAN
++#define GPO_CROND "cron"
++#else
+ #define GPO_CROND "crond"
++#endif
+ #define GPO_POLKIT "polkit-1"
+ #define GPO_SUDO "sudo"
+ #define GPO_SUDO_I "sudo-i"
+-- 
+2.17.1
+


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 #placeholder
+GPO_CROND-customization.diff



View it on GitLab: https://salsa.debian.org/sssd-team/sssd/commit/42b041a1016cfaa020afd32a8a51006b16b81ea1

-- 
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/commit/42b041a1016cfaa020afd32a8a51006b16b81ea1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-sssd-devel/attachments/20190228/e9902bb0/attachment-0001.html>