Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r39996 - in /trunk/kerberos-client: VERSION agents/etc_pam_pkcs11_conf.scr package/yast2-kerberos-client.changes src/Kerberos.ycp
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Mon, 06 Aug 2007 13:01:00 -0000
  • Message-id: <20070806130100.E92A7B5A97@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Mon Aug  6 15:01:00 2007
New Revision: 39996

URL: http://svn.opensuse.org/viewcvs/yast?rev=39996&view=rev
Log:
- Smart Card Integration (F302132):
  - modify /etc/pam_pkcs11/pam_pkcs11.conf if it is present
  - write domain without leading dot in domain_realm section
- 2.15.7


Added:
    trunk/kerberos-client/agents/etc_pam_pkcs11_conf.scr
Modified:
    trunk/kerberos-client/VERSION
    trunk/kerberos-client/package/yast2-kerberos-client.changes
    trunk/kerberos-client/src/Kerberos.ycp

Modified: trunk/kerberos-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=39996&r1=39995&r2=39996&view=diff
==============================================================================
--- trunk/kerberos-client/VERSION (original)
+++ trunk/kerberos-client/VERSION Mon Aug  6 15:01:00 2007
@@ -1 +1 @@
-2.15.6
+2.15.7

Added: trunk/kerberos-client/agents/etc_pam_pkcs11_conf.scr
URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/agents/etc_pam_pkcs11_conf.scr?rev=39996&view=auto
==============================================================================
--- trunk/kerberos-client/agents/etc_pam_pkcs11_conf.scr (added)
+++ trunk/kerberos-client/agents/etc_pam_pkcs11_conf.scr Mon Aug  6 15:01:00 2007
@@ -0,0 +1,33 @@
+/**
+ * File:
+ *   etc_pam_pkcs11_conf.scr
+ * Summary:
+ *   SCR Agent for reading/writing /etc/pam_pkcs11/pam_pkcs11.conf
+ *
+ * $Id: etc_krb5_conf.scr 36303 2007-02-20 12:29:00Z jsuchome $
+ *
+ * Read/Sets the values defined in <tt>/etc/pam_pkcs11/pam_pkcs11.conf</tt>.
+ */
+.etc.pam_pkcs11_conf
+
+`ag_ini(
+  `IniAgent(
+   "/etc/pam_pkcs11/pam_pkcs11.conf",
+    $[
+      "options" : [ "comments_last" ],
+      "comments": [ "^[ \t]*#.*", "#.*", "^[ \t]*$" ],
+      "sections" : [
+        $[
+        "begin" : [ "^[ \t]*(.*[^ \t])[ \t]*[ \t]*\\{[ \t]*", "%s {" ],
+        "end" : [ "^[ \t]*[ \t]*\\}[ \t]*", "}" ]
+        ]
+      ],
+      "subindent": "\t",
+      "params" : [
+        $[
+        "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*(.*[^ \t]|)[ \t]*;[ \t]*$" , "%s = %s;"],
+      ],
+    ],
+    ]
+  )
+)

Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-kerberos-client.changes?rev=39996&r1=39995&r2=39996&view=diff
==============================================================================
--- trunk/kerberos-client/package/yast2-kerberos-client.changes (original)
+++ trunk/kerberos-client/package/yast2-kerberos-client.changes Mon Aug  6 15:01:00 2007
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Jul 31 12:25:15 CEST 2007 - jsuchome@xxxxxxx
+
+- Smart Card Integration (F302132):
+  - modify /etc/pam_pkcs11/pam_pkcs11.conf if it is present
+  - write domain without leading dot in domain_realm section
+- 2.15.7
+
+-------------------------------------------------------------------
 Tue Jun 19 09:26:50 CEST 2007 - jsuchome@xxxxxxx
 
 - added support for "pkinit" section in krb5.conf (F302132)

Modified: trunk/kerberos-client/src/Kerberos.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=39996&r1=39995&r2=39996&view=diff
==============================================================================
--- trunk/kerberos-client/src/Kerberos.ycp (original)
+++ trunk/kerberos-client/src/Kerberos.ycp Mon Aug  6 15:01:00 2007
@@ -449,9 +449,12 @@
        if (default_domain != "")
        {
            string domain = default_domain;
+           WriteKrb5ConfValue (add(.etc.krb5_conf.v.domain_realm,domain),default_realm);
            if ( findfirstof (domain, ".") != 0)
+           {
                domain = "." + domain;
-           WriteKrb5ConfValue (add(.etc.krb5_conf.v.domain_realm,domain),default_realm);
+               WriteKrb5ConfValue (add(.etc.krb5_conf.v.domain_realm,domain),default_realm);
+           }
        }
 
        WriteKrb5ConfValue (.etc.krb5_conf.v.libdefaults.clockskew, clockskew);
@@ -509,6 +512,12 @@
            }
            WriteKrb5ConfValue (
                add (pkinit_sect, "trusted_servers"), trusted_servers);
+           if (FileUtils::Exists ("/etc/pam_pkcs11/pam_pkcs11.conf"))
+           {
+               SCR::Write (add (add (.etc.pam_pkcs11_conf.v.pam_pkcs11, "mapper ms"), "domainname"), default_realm);
+               SCR::Write (add (add (.etc.pam_pkcs11_conf.v.pam_pkcs11, "mapper ms"), "domainnickname"), default_domain);
+               SCR::Write (.etc.pam_pkcs11_conf, nil);
+           }
        }
 
        // write the changes now

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages