basebuilder_pel7ppc64lebuilder0
5 years ago
4 changed files with 71 additions and 1 deletions
@ -0,0 +1,25 @@ |
|||||||
|
diff --git a/src/entry.c b/src/entry.c |
||||||
|
index 3638207..ce37756 100644 |
||||||
|
--- a/src/entry.c |
||||||
|
+++ b/src/entry.c |
||||||
|
@@ -343,8 +343,18 @@ entry *load_entry(FILE * file, void (*error_func) (), struct passwd *pw, |
||||||
|
e->envp = tenvp; |
||||||
|
#ifndef LOGIN_CAP |
||||||
|
/* If login.conf is in used we will get the default PATH later. */ |
||||||
|
- if (ChangePath && !env_get("PATH", e->envp)) { |
||||||
|
- if (glue_strings(envstr, sizeof envstr, "PATH", _PATH_DEFPATH, '=')) { |
||||||
|
+ if (!env_get("PATH", e->envp)) { |
||||||
|
+ char *defpath; |
||||||
|
+ |
||||||
|
+ if (ChangePath) |
||||||
|
+ defpath = _PATH_DEFPATH; |
||||||
|
+ else { |
||||||
|
+ defpath = getenv("PATH"); |
||||||
|
+ if (defpath == NULL) |
||||||
|
+ defpath = _PATH_DEFPATH; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ if (glue_strings(envstr, sizeof envstr, "PATH", defpath, '=')) { |
||||||
|
if ((tenvp = env_set(e->envp, envstr)) == NULL) { |
||||||
|
ecode = e_memory; |
||||||
|
goto eof; |
@ -0,0 +1,12 @@ |
|||||||
|
diff -ru cronie-1.4.11/contrib/cronie.systemd cronie-1.4.11_patched/contrib/cronie.systemd |
||||||
|
--- cronie-1.4.11/contrib/cronie.systemd 2018-11-27 15:26:46.797288342 +0100 |
||||||
|
+++ cronie-1.4.11_patched/contrib/cronie.systemd 2018-11-27 15:26:19.479159225 +0100 |
||||||
|
@@ -7,6 +7,8 @@ |
||||||
|
ExecStart=/usr/sbin/crond -n $CRONDARGS |
||||||
|
ExecReload=/bin/kill -HUP $MAINPID |
||||||
|
KillMode=process |
||||||
|
+Restart=on-failure |
||||||
|
+RestartSec=30s |
||||||
|
|
||||||
|
[Install] |
||||||
|
WantedBy=multi-user.target |
@ -0,0 +1,14 @@ |
|||||||
|
diff -ru cronie-1.4.11/pam/crond cronie-1.4.11_patched/pam/crond |
||||||
|
--- cronie-1.4.11/pam/crond 2013-07-18 14:27:08.000000000 +0200 |
||||||
|
+++ cronie-1.4.11_patched/pam/crond 2018-12-04 16:01:53.220225842 +0100 |
||||||
|
@@ -4,7 +4,7 @@ |
||||||
|
# |
||||||
|
# No PAM authentication called, auth modules not needed |
||||||
|
account required pam_access.so |
||||||
|
-account include password-auth |
||||||
|
+account include system-auth |
||||||
|
session required pam_loginuid.so |
||||||
|
-session include password-auth |
||||||
|
-auth include password-auth |
||||||
|
+session include system-auth |
||||||
|
+auth include system-auth |
Loading…
Reference in new issue