diff options
Diffstat (limited to 'sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control')
| -rw-r--r-- | sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control b/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control index 4a7122951497..0294fea503ca 100644 --- a/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control +++ b/sysutils/google-compute-engine-oslogin/files/patch-bin_google__oslogin__control @@ -1,6 +1,6 @@ ---- bin/google_oslogin_control.orig 2017-12-13 23:47:59 UTC +--- bin/google_oslogin_control.orig 2018-06-11 17:16:50 UTC +++ bin/google_oslogin_control -@@ -65,29 +65,31 @@ overwrite_file() { +@@ -65,24 +65,26 @@ overwrite_file() { remove_from_config() { config=$1 @@ -9,7 +9,11 @@ } remove_from_nss_config() { +- sed -i '/^passwd:/ s/ cache_oslogin oslogin//' ${nss_config}.new +- sed -i '/^passwd:/ s/ cache oslogin//' ${nss_config}.new - sed -i '/^passwd:/ s/ oslogin//' ${nss_config}.new ++ gsed -i '/^passwd:/ s/ cache_oslogin oslogin//' ${nss_config}.new ++ gsed -i '/^passwd:/ s/ cache oslogin//' ${nss_config}.new + gsed -i '/^passwd:/ s/ oslogin//' ${nss_config}.new } @@ -23,24 +27,27 @@ add_to_nss_config() { remove_from_nss_config -- sed -i '/^passwd:/ s/$/ oslogin/' ${nss_config}.new -+ gsed -i '/^passwd:/ s/$/ oslogin/' ${nss_config}.new +- sed -i '/^passwd:/ s/$/ cache_oslogin oslogin/' ${nss_config}.new ++ gsed -i '/^passwd:/ s/$/ cache_oslogin oslogin/' ${nss_config}.new + # Replace compat by files (as compat cannot be used with other sources) + gsed -i '/^passwd:/ s/compat/files/' ${nss_config}.new } add_to_pam_config() { - remove_from_config ${pam_config} -- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new -- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new -- sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new -+ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new -+ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new -+ gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new +@@ -99,9 +101,9 @@ ${pam_homedir} + " + echo "${added_config}$(cat ${pam_config}.new)" > ${pam_config}.new + else +- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new +- sed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new +- sed -i "/pam_loginuid.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new ++ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_admin}" ${pam_config}.new ++ gsed -i "/account.*pam_nologin.so/ a${added_comment}\n${pam_login}" ${pam_config}.new ++ gsed -i "/session.*pam_permit.so/ a${added_comment}\n${pam_homedir}" ${pam_config}.new + fi } - restart_service() { -@@ -100,7 +102,7 @@ restart_service() { +@@ -115,7 +117,7 @@ restart_service() { fi fi if which service > /dev/null 2>&1; then |