saving uncommitted changes in /etc prior to emerge run

diff --git a/pam.d/system-auth b/pam.d/system-auth
index 1a285d68b0f3cc8f8309b791e14e5351233406fe..20bf66db9e195eb4b4890ebf9eb09a3e5dd6bbd9 100644 (file)
--- a/pam.d/system-auth
+++ b/pam.d/system-auth
@@ -1,15 +1,15 @@
 auth           required        pam_env.so 
 auth           sufficient      pam_ssh.so
-auth           [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
+# auth         [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
 auth           required        pam_unix.so try_first_pass likeauth nullok 
 auth           optional        pam_permit.so
  
-account                [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
+# account              [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
 account                required        pam_unix.so 
 account                optional        pam_permit.so
  
 password       required        pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 
-password       [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
+# password     [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
 password       required        pam_unix.so try_first_pass use_authtok nullok sha512 shadow 
 password       optional        pam_permit.so
  
@@ -17,6 +17,6 @@ session               optional        pam_ssh.so
 session                required        pam_limits.so 
 session                required        pam_env.so 
 session                optional        pam_mktemp.so
-session                [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
+# session              [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
 session                required        pam_unix.so 
 session                optional        pam_permit.so

diff --git a/pam.d/system-services b/pam.d/system-services
index 982364cfb07cfb15e8a31dad8d68aaa40e13283f..0e1bae34e1c17d3d60dd5e6ddf64730e23e1ef51 100644 (file)
--- a/pam.d/system-services
+++ b/pam.d/system-services
@@ -4,6 +4,6 @@ session         optional        pam_loginuid.so
 session                required        pam_limits.so 
 session                required        pam_env.so 
 session                optional        pam_mktemp.so
-session                [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
+# session              [success=1 default=ignore]      pam_krb5.so  ignore_root try_first_pass
 session                required        pam_unix.so 
 session                optional        pam_permit.so

diff --git a/printcap b/printcap
index d4972e51e935f218ca22d265145cb6f322be142c..44341738924de0763a53ae38e247ef8a097cd2ad 100644 (file)
--- a/printcap
+++ b/printcap
@@ -1,4 +1,11 @@
 # This file was automatically generated by cupsd(8) from the
 # /etc/cups/printers.conf file.  All changes to this file
 # will be lost.
+default|Drucker im Büro:rm=samara:rp=default:
+Backoffice|R&I and SysOp:rm=samara:rp=Backoffice:
+Brother_MFC-7440N|Brother MFC-7440N:rm=samara:rp=Brother_MFC-7440N:
+Dell2330dn|Dell 2330dn Printer:rm=samara:rp=Dell2330dn:
 Dell_2330dn_Laser_Printer|Dell 2330dn Laser Printer:rm=samara:rp=Dell_2330dn_Laser_Printer:
+HP_LaserJet_CP1525nw|HP Color LaserJet CP1525nw:rm=samara:rp=HP_LaserJet_CP1525nw:
+HP_LaserJet_M1536dnf|HP LaserJet M1536dnf MFP:rm=samara:rp=HP_LaserJet_M1536dnf:
+Marketing|Marketing and Sales:rm=samara:rp=Marketing: