Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (941 mails)

< Previous Next >
commit pam-config for openSUSE:Factory
Hello community,

here is the log from the commit of package pam-config for openSUSE:Factory
checked in at 2012-04-12 09:44:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam-config (Old)
and /work/SRC/openSUSE:Factory/.pam-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pam-config", Maintainer is "kukuk@xxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/pam-config/pam-config.changes 2012-02-15
16:17:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pam-config.new/pam-config.changes
2012-04-12 09:44:36.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 3 16:07:52 CEST 2012 - kukuk@xxxxxxx
+
+- Add support for pam_ecryptfs [bnc#752851]
+
+-------------------------------------------------------------------

Old:
----
pam-config-0.79.tar.bz2
pam_systemd.patch

New:
----
pam-config-0.80.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pam-config.spec ++++++
--- /var/tmp/diff_new_pack.8JNHlH/_old 2012-04-12 09:44:36.000000000 +0200
+++ /var/tmp/diff_new_pack.8JNHlH/_new 2012-04-12 09:44:36.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pam-config
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,16 @@
#


-
Name: pam-config
Summary: Modify common PAM configuration files
License: GPL-2.0
Group: System/Management
-Version: 0.79
+Version: 0.80
Release: 0
BuildRequires: automake
PreReq: pam >= 0.99
Requires: pam-modules >= 10.2
Source: %{name}-%{version}.tar.bz2
-Patch0: pam_systemd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -41,11 +39,8 @@

%prep
%setup -q
-%patch0 -p1

%build
-#needed by patch0
-autoreconf
%configure
make %{?_smp_mflags}


++++++ pam-config-0.79.tar.bz2 -> pam-config-0.80.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/ChangeLog
new/pam-config-0.80/ChangeLog
--- old/pam-config-0.79/ChangeLog 2011-05-10 12:00:06.000000000 +0200
+++ new/pam-config-0.80/ChangeLog 2012-04-03 16:05:37.000000000 +0200
@@ -1,3 +1,17 @@
+2012-04-03 Thorsten Kukuk <kukuk@xxxxxxx>
+
+ * src/Makefile.am: Add mod_pam_ecryptfs.c
+ * src/mod_pam_cryptfs: New.
+ * src/supported-modules: Add pam_ecryptfs.c
+ Patch from Darin Perusich <darin@xxxxxxxxxx>, bnc#752851.
+
+2011-08-18 Thorsten Kukuk <kukuk@xxxxxxx>
+
+ * src/Makefile.am: Add mod_pam_systemd.c
+ * src/mod_pam_systemd.c: New.
+ * src/supported-modules.h: Add pam_systemd.
+ Patch from Frederic Crozat <fcrozat@xxxxxxxxxx>, bnc#700053.
+
2011-05-10 Thorsten Kukuk <kukuk@xxxxxxx>

* release version 0.79
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/NEWS new/pam-config-0.80/NEWS
--- old/pam-config-0.79/NEWS 2011-05-10 12:58:46.000000000 +0200
+++ new/pam-config-0.80/NEWS 2012-04-03 16:04:52.000000000 +0200
@@ -4,6 +4,9 @@

Please enter bug reports into bugzilla.novell.com.

+Version 0.80
+* Add pam_systemd and pam_ecryptfs [bnc#752851].
+
Version 0.79
* Make pam_lastlog optional [bnc#686034].
* Document that if symlinks don't point to *-pc files config is ignored
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/configure
new/pam-config-0.80/configure
--- old/pam-config-0.79/configure 2011-05-10 12:58:53.000000000 +0200
+++ new/pam-config-0.80/configure 2012-04-03 16:03:48.000000000 +0200
@@ -2209,7 +2209,7 @@

# Define the identity of the package.
PACKAGE="pam-config"
- VERSION=0.79
+ VERSION=0.80


cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/configure.in
new/pam-config-0.80/configure.in
--- old/pam-config-0.79/configure.in 2011-05-10 12:55:45.000000000 +0200
+++ new/pam-config-0.80/configure.in 2012-04-03 16:03:42.000000000 +0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/pam-config.c)
-AM_INIT_AUTOMAKE("pam-config", 0.79)
+AM_INIT_AUTOMAKE("pam-config", 0.80)
AM_CONFIG_HEADER(config.h)
AC_PREFIX_DEFAULT(/usr)

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/po/POTFILES.in
new/pam-config-0.80/po/POTFILES.in
--- old/pam-config-0.79/po/POTFILES.in 2010-10-13 14:45:05.000000000 +0200
+++ new/pam-config-0.80/po/POTFILES.in 2012-04-03 16:06:02.000000000 +0200
@@ -7,6 +7,7 @@
src/mod_pam_cryptpass.c
src/mod_pam_csync.c
src/mod_pam_deny.c
+src/mod_pam_ecryptfs.c
src/mod_pam_env.c
src/mod_pam_exec.c
src/mod_pam_fp.c
@@ -32,6 +33,7 @@
src/mod_pam_ssh.c
src/mod_pam_sss.c
src/mod_pam_succeed_if.c
+src/mod_pam_systemd.c
src/mod_pam_thinkfinger.c
src/mod_pam_time.c
src/mod_pam_umask.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/Makefile.am
new/pam-config-0.80/src/Makefile.am
--- old/pam-config-0.79/src/Makefile.am 2010-10-13 13:34:28.000000000 +0200
+++ new/pam-config-0.80/src/Makefile.am 2012-04-03 15:59:00.000000000 +0200
@@ -30,7 +30,8 @@
mod_pam_group.c mod_pam_time.c mod_pam_ssh.c mod_pam_succeed_if.c \
mod_pam_csync.c mod_pam_fp.c mod_pam_fprint.c mod_pam_pwhistory.c \
mod_pam_selinux.c mod_pam_gnome_keyring.c mod_pam_passwdqc.c \
- mod_pam_exec.c mod_pam_sss.c mod_pam_fprintd.c
+ mod_pam_exec.c mod_pam_sss.c mod_pam_fprintd.c mod_pam_systemd.c \
+ mod_pam_ecryptfs.c

noinst_HEADERS = pam-config.h pam-module.h

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/Makefile.in
new/pam-config-0.80/src/Makefile.in
--- old/pam-config-0.79/src/Makefile.in 2011-05-10 12:58:51.000000000 +0200
+++ new/pam-config-0.80/src/Makefile.in 2012-04-03 16:03:47.000000000 +0200
@@ -79,7 +79,8 @@
mod_pam_fprint.$(OBJEXT) mod_pam_pwhistory.$(OBJEXT) \
mod_pam_selinux.$(OBJEXT) mod_pam_gnome_keyring.$(OBJEXT) \
mod_pam_passwdqc.$(OBJEXT) mod_pam_exec.$(OBJEXT) \
- mod_pam_sss.$(OBJEXT) mod_pam_fprintd.$(OBJEXT)
+ mod_pam_sss.$(OBJEXT) mod_pam_fprintd.$(OBJEXT) \
+ mod_pam_systemd.$(OBJEXT) mod_pam_ecryptfs.$(OBJEXT)
pam_config_OBJECTS = $(am_pam_config_OBJECTS)
pam_config_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -230,7 +231,8 @@
mod_pam_group.c mod_pam_time.c mod_pam_ssh.c mod_pam_succeed_if.c \
mod_pam_csync.c mod_pam_fp.c mod_pam_fprint.c mod_pam_pwhistory.c \
mod_pam_selinux.c mod_pam_gnome_keyring.c mod_pam_passwdqc.c \
- mod_pam_exec.c mod_pam_sss.c mod_pam_fprintd.c
+ mod_pam_exec.c mod_pam_sss.c mod_pam_fprintd.c mod_pam_systemd.c \
+ mod_pam_ecryptfs.c

noinst_HEADERS = pam-config.h pam-module.h
all: all-am
@@ -324,6 +326,7 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/mod_pam_cryptpass.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_csync.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_deny.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_ecryptfs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_env.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_exec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_fp.Po@am__quote@
@@ -349,6 +352,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_ssh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_sss.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/mod_pam_succeed_if.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_systemd.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/mod_pam_thinkfinger.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_time.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_umask.Po@am__quote@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/mod_pam_ecryptfs.c
new/pam-config-0.80/src/mod_pam_ecryptfs.c
--- old/pam-config-0.79/src/mod_pam_ecryptfs.c 1970-01-01 01:00:00.000000000
+0100
+++ new/pam-config-0.80/src/mod_pam_ecryptfs.c 2012-04-03 16:02:04.000000000
+0200
@@ -0,0 +1,74 @@
+/* Copyright (C) 2007, 2008 Thorsten Kukuk
+ Author: Thorsten Kukuk <kukuk@xxxxxxxxxx>
+
+ Copyright 2012 Darin Perusich
+ Author: Darin Perusich <darin@xxxxxxxxxx>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "pam-config.h"
+#include "pam-module.h"
+
+static int
+write_config_ecryptfs (pam_module_t * this, enum write_type op, FILE * fp)
+{
+ option_set_t *opt_set = this->get_opt_set (this, op);
+
+ if (debug)
+ debug_write_call (this, op);
+
+ if (!opt_set->is_enabled (opt_set, "is_enabled"))
+ return 0;
+
+ switch (op)
+ {
+ case AUTH:
+ fprintf (fp, "auth\trequired\tpam_ecryptfs.so\tunwrap\n");
+ break;
+ case SESSION:
+ fprintf (fp, "session\toptional\tpam_ecryptfs.so\tunwrap\n");
+ break;
+ default:
+ return 0;
+ }
+ return 0;
+}
+
+PRINT_ARGS("ecryptfs")
+PRINT_XMLHELP("ecryptfs")
+
+/* ---- contruct module object ---- */
+DECLARE_BOOL_OPTS_2 (is_enabled, unwrap);
+DECLARE_STRING_OPTS_0;
+DECLARE_OPT_SETS;
+
+static module_helptext_t helptext[] = {{NULL, NULL, NULL}};
+
+/* at last construct the complete module object */
+pam_module_t mod_pam_ecryptfs = { "pam_ecryptfs.so", opt_sets, helptext,
+ &def_parse_config,
+ &def_print_module,
+ &write_config_ecryptfs,
+ &get_opt_set,
+ NULL,
+ &print_args,
+ &print_xmlhelp};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/mod_pam_systemd.c
new/pam-config-0.80/src/mod_pam_systemd.c
--- old/pam-config-0.79/src/mod_pam_systemd.c 1970-01-01 01:00:00.000000000
+0100
+++ new/pam-config-0.80/src/mod_pam_systemd.c 2011-08-18 15:40:05.000000000
+0200
@@ -0,0 +1,120 @@
+/* Copyright (C) 2011 Frederic Crozat
+ Author: Frederic Crozat <fcrozat@xxxxxxxx>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "pam-config.h"
+#include "pam-module.h"
+
+static int
+write_config_systemd (pam_module_t *this, enum write_type op, FILE *fp)
+{
+ option_set_t *opt_set = this->get_opt_set (this, op);
+ char *opt;
+
+ if (debug)
+ debug_write_call (this, op);
+
+ if (op != SESSION || !opt_set->is_enabled (opt_set, "is_enabled"))
+ return 0;
+
+ fprintf (fp, "session\toptional\tpam_systemd.so");
+
+ if (opt_set->is_enabled (opt_set, "debug"))
+ fprintf(fp, " debug");
+ if ((opt = opt_set->get_opt (opt_set, "kill_session_processes")))
+ fprintf(fp, " kill-session-processes=%s",opt);
+ if ((opt = opt_set->get_opt (opt_set, "kill_only_users")))
+ fprintf(fp, " kill-only-users=%s",opt);
+ if ((opt = opt_set->get_opt (opt_set, "kill_exclude_users")))
+ fprintf(fp, " kill-exclude-users=%s",opt);
+ if ((opt = opt_set->get_opt (opt_set, "controllers")))
+ fprintf(fp, " controllers=%s",opt);
+ if ((opt = opt_set->get_opt (opt_set, "reset_controllers")))
+ fprintf(fp, " reset-controllers=%s",opt);
+
+ fprintf(fp, "\n");
+ return 0;
+
+}
+
+static int
+parse_config_systemd (pam_module_t *this, char *args, write_type_t type)
+{
+ option_set_t *opt_set = this->get_opt_set (this, type);
+
+ if (debug)
+ printf ("**** parse_config_%s (%s): '%s'\n", this->name,
+ type2string (type), args ? args : "");
+
+ opt_set->enable (opt_set, "is_enabled", TRUE);
+
+ while (args && strlen (args) > 0)
+ {
+ char *cp = strsep (&args, " \t");
+
+ if (args)
+ while (isspace ((int) *args))
+ ++args;
+
+ if (strcmp (cp, "debug") == 0)
+ opt_set->enable (opt_set, "debug", TRUE);
+ else if (strncmp (cp, "kill-session-processes=", 13) == 0)
+ opt_set->set_opt (opt_set, "kill_session_processes",
strdup(&cp[13]));
+ else if (strncmp (cp, "kill-only-users=", 16) == 0)
+ opt_set->set_opt (opt_set, "kill_only_users", strdup (&cp[16]));
+ else if (strncmp (cp, "kill-exclude-users=", 19) == 0)
+ opt_set->set_opt (opt_set, "kill_exclude_users", strdup (&cp[19]));
+ else if (strncmp (cp, "controllers=", 12) == 0)
+ opt_set->set_opt (opt_set, "controllers", strdup (&cp[12]));
+ else if (strncmp (cp, "reset-controllers=", 18) == 0)
+ opt_set->set_opt (opt_set, "reset_controllers", strdup (&cp[18]));
+ else
+ print_unknown_option_error ("pam_systemd.so", cp);
+ }
+ return 1;
+}
+
+GETOPT_START_1(SESSION)
+GETOPT_END_1(SESSION)
+
+PRINT_ARGS("systemd")
+PRINT_XMLHELP("systemd")
+
+/* ---- contruct module object ---- */
+DECLARE_BOOL_OPTS_2 (is_enabled, debug);
+DECLARE_STRING_OPTS_5 (kill_session_processes, kill_only_users,
kill_exclude_users, controllers, reset_controllers);
+DECLARE_OPT_SETS;
+
+static module_helptext_t helptext[] = {{NULL, NULL, NULL}};
+
+
+/* at last construct the complete module object */
+pam_module_t mod_pam_systemd = { "pam_systemd.so", opt_sets, helptext,
+ &parse_config_systemd,
+ &def_print_module,
+ &write_config_systemd,
+ &get_opt_set,
+ &getopt,
+ &print_args,
+ &print_xmlhelp};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/pam-config.8
new/pam-config-0.80/src/pam-config.8
--- old/pam-config-0.79/src/pam-config.8 2011-05-10 12:59:13.000000000
+0200
+++ new/pam-config-0.80/src/pam-config.8 2012-04-03 16:03:55.000000000
+0200
@@ -1,12 +1,12 @@
.\" Title: pam-config
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\" Date: 05/10/2011
+.\" Date: 04/03/2012
.\" Manual: Reference Manual
.\" Source: Reference Manual
.\" Language: English
.\"
-.TH "PAM\-CONFIG" "8" "05/10/2011" "Reference Manual" "Reference Manual"
+.TH "PAM\-CONFIG" "8" "04/03/2012" "Reference Manual" "Reference Manual"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
@@ -362,6 +362,18 @@
option to pam_cracklib\&.so\&.
.RE
.PP
+\fB\-\-ecryptfs\fR
+.RS 4
+Enable/Disable pam_ecryptfs\&.so
+.RE
+.PP
+\fB\-\-ecryptfs\-unwrap\fR
+.RS 4
+Add
+\fBunwrap\fR
+option to all pam_ecryptfs\&.so invocations\&.
+.RE
+.PP
\fB\-\-env\fR
.RS 4
Enable/Disable pam_env\&.so
@@ -917,6 +929,53 @@
option to all pam_sss\&.so invocations\&.
.RE
.PP
+\fB\-\-systemd\fR
+.RS 4
+Enable/Disable pam_systemd\&.so
+.RE
+.PP
+\fB\-\-systemd\-debug\fR
+.RS 4
+Add
+\fBdebug\fR
+option to all pam_systemd\&.so invocations\&.
+.RE
+.PP
+\fB\-\-systemd\-kill_session_processes=\fR\fIvalue\fR
+.RS 4
+Add
+\fBkill_session_processes=\fR\fIvalue\fR
+option to pam_systemd\&.so\&.
+.RE
+.PP
+\fB\-\-systemd\-kill_only_users=\fR\fIvalue\fR
+.RS 4
+Add
+\fBkill_only_users=\fR\fIvalue\fR
+option to pam_systemd\&.so\&.
+.RE
+.PP
+\fB\-\-systemd\-kill_exclude_users=\fR\fIvalue\fR
+.RS 4
+Add
+\fBkill_exclude_users=\fR\fIvalue\fR
+option to pam_systemd\&.so\&.
+.RE
+.PP
+\fB\-\-systemd\-controllers=\fR\fIvalue\fR
+.RS 4
+Add
+\fBcontrollers=\fR\fIvalue\fR
+option to pam_systemd\&.so\&.
+.RE
+.PP
+\fB\-\-systemd\-reset_controllers=\fR\fIvalue\fR
+.RS 4
+Add
+\fBreset_controllers=\fR\fIvalue\fR
+option to pam_systemd\&.so\&.
+.RE
+.PP
\fB\-\-thinkfinger\fR
.RS 4
Enable/Disable pam_thinkfinger\&.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/pam-config.8.xml
new/pam-config-0.80/src/pam-config.8.xml
--- old/pam-config-0.79/src/pam-config.8.xml 2011-05-10 12:59:12.000000000
+0200
+++ new/pam-config-0.80/src/pam-config.8.xml 2012-04-03 16:03:54.000000000
+0200
@@ -290,6 +290,22 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>--ecryptfs</option></term>
+ <listitem>
+ <para>
+ Enable/Disable pam_ecryptfs.so
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--ecryptfs-unwrap</option></term>
+ <listitem>
+ <para>
+ Add <option>unwrap</option> option to all pam_ecryptfs.so
invocations.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>--env</option></term>
<listitem>
<para>
@@ -969,6 +985,62 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--systemd</option></term>
+ <listitem>
+ <para>
+ Enable/Disable pam_systemd.so
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--systemd-debug</option></term>
+ <listitem>
+ <para>
+ Add <option>debug</option> option to all pam_systemd.so
invocations.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+
<term><option>--systemd-kill_session_processes=</option><replaceable>value</replaceable></term>
+ <listitem>
+ <para>
+ Add
<option>kill_session_processes=</option><replaceable>value</replaceable> option
to pam_systemd.so.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+
<term><option>--systemd-kill_only_users=</option><replaceable>value</replaceable></term>
+ <listitem>
+ <para>
+ Add
<option>kill_only_users=</option><replaceable>value</replaceable> option to
pam_systemd.so.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+
<term><option>--systemd-kill_exclude_users=</option><replaceable>value</replaceable></term>
+ <listitem>
+ <para>
+ Add
<option>kill_exclude_users=</option><replaceable>value</replaceable> option to
pam_systemd.so.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+
<term><option>--systemd-controllers=</option><replaceable>value</replaceable></term>
+ <listitem>
+ <para>
+ Add
<option>controllers=</option><replaceable>value</replaceable> option to
pam_systemd.so.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+
<term><option>--systemd-reset_controllers=</option><replaceable>value</replaceable></term>
+ <listitem>
+ <para>
+ Add
<option>reset_controllers=</option><replaceable>value</replaceable> option to
pam_systemd.so.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><option>--thinkfinger</option></term>
<listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/pam-config.c
new/pam-config-0.80/src/pam-config.c
--- old/pam-config-0.79/src/pam-config.c 2010-08-31 16:50:08.000000000
+0200
+++ new/pam-config-0.80/src/pam-config.c 2012-04-03 15:58:31.000000000
+0200
@@ -488,6 +488,7 @@
{"winbind", no_argument, NULL, 2200 },
{"winbind-debug", no_argument, NULL, 2201 },
{"sss", no_argument, NULL, 2300 },
+ {"ecryptfs", no_argument, NULL, 2400 },
{NULL, 0, NULL, 0 }
};
static struct option service_long_options[] = {
@@ -692,6 +693,20 @@
opt_set->enable (opt_set, "is_enabled", opt.opt_val);
}
break;
+ case 2400:
+ /* pam_ecryptfs.so */
+ if (opt.m_query)
+ print_module_config (common_module_list, "pam_ecryptfs.so");
+ else
+ {
+ if (!opt.m_delete && check_for_pam_module ("pam_ecryptfs.so",
opt.force) != 0)
+ return 1;
+ opt_set = mod_pam_ecryptfs.get_opt_set (&mod_pam_ecryptfs, AUTH);
+ opt_set->enable (opt_set, "is_enabled", opt.opt_val);
+ opt_set = mod_pam_ecryptfs.get_opt_set (&mod_pam_ecryptfs,
SESSION);
+ opt_set->enable (opt_set, "is_enabled", opt.opt_val);
+ }
+ break;
/* From here we have single service modules */
case 3200:
/* pam_cryptpass.so */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/src/supported-modules.h
new/pam-config-0.80/src/supported-modules.h
--- old/pam-config-0.79/src/supported-modules.h 2010-10-13 13:38:21.000000000
+0200
+++ new/pam-config-0.80/src/supported-modules.h 2012-04-03 15:58:31.000000000
+0200
@@ -2,6 +2,7 @@
extern pam_module_t mod_pam_ccreds;
extern pam_module_t mod_pam_cracklib;
extern pam_module_t mod_pam_deny;
+extern pam_module_t mod_pam_ecryptfs;
extern pam_module_t mod_pam_env;
extern pam_module_t mod_pam_exec;
extern pam_module_t mod_pam_fp;
@@ -39,12 +40,14 @@
extern pam_module_t mod_pam_csync;
extern pam_module_t mod_pam_loginuid;
extern pam_module_t mod_pam_mount;
+extern pam_module_t mod_pam_systemd;

pam_module_t *common_module_list[] = {
&mod_pam_apparmor,
&mod_pam_ccreds,
&mod_pam_cracklib,
&mod_pam_deny,
+ &mod_pam_ecryptfs,
&mod_pam_env,
&mod_pam_exec,
&mod_pam_fp,
@@ -67,6 +70,7 @@
&mod_pam_ssh,
&mod_pam_sss,
&mod_pam_succeed_if,
+ &mod_pam_systemd,
&mod_pam_thinkfinger,
&mod_pam_umask,
&mod_pam_unix,
@@ -89,6 +93,7 @@
};

static pam_module_t *module_list_auth[] = {
+ &mod_pam_ecryptfs,
&mod_pam_env,
&mod_pam_group,
&mod_pam_pkcs11,
@@ -143,9 +148,11 @@
&mod_pam_nam,
&mod_pam_umask,
&mod_pam_ssh,
+ &mod_pam_systemd,
&mod_pam_selinux,
&mod_pam_gnome_keyring,
&mod_pam_exec,
+ &mod_pam_ecryptfs,
&mod_pam_env,
NULL
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/tests/config/Makefile
new/pam-config-0.80/tests/config/Makefile
--- old/pam-config-0.79/tests/config/Makefile 2011-05-10 12:58:57.000000000
+0200
+++ new/pam-config-0.80/tests/config/Makefile 2012-04-03 16:03:50.000000000
+0200
@@ -49,11 +49,11 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
aclocal-1.10
-AMTAR = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run tar
-AUTOCONF = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
autoconf
-AUTOHEADER = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
autoheader
-AUTOMAKE = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
automake-1.10
+ACLOCAL = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
aclocal-1.10
+AMTAR = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
automake-1.10
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -87,11 +87,11 @@
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
-MAKEINFO = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
makeinfo
+MAKEINFO = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
+MSGMERGE = :
OBJEXT = o
PACKAGE = pam-config
PACKAGE_BUGREPORT =
@@ -106,17 +106,17 @@
SHELL = /bin/sh
STRIP =
USE_NLS = yes
-VERSION = 0.79
-XGETTEXT = /usr/bin/xgettext
-XGETTEXT_015 = /usr/bin/xgettext
+VERSION = 0.80
+XGETTEXT = :
+XGETTEXT_015 = :
XMLCATALOG = /usr/bin/xmlcatalog
XMLLINT = /usr/bin/xmllint
XML_CATALOG_FILE = /etc/xml/catalog
XSLTPROC = /usr/bin/xsltproc
-abs_builddir = /data/kukuk/pakete/svn/pam-config/trunk/tests/config
-abs_srcdir = /data/kukuk/pakete/svn/pam-config/trunk/tests/config
-abs_top_builddir = /data/kukuk/pakete/svn/pam-config/trunk
-abs_top_srcdir = /data/kukuk/pakete/svn/pam-config/trunk
+abs_builddir = /home/kukuk/pakete/svn/pam-config/trunk/tests/config
+abs_srcdir = /home/kukuk/pakete/svn/pam-config/trunk/tests/config
+abs_top_builddir = /home/kukuk/pakete/svn/pam-config/trunk
+abs_top_srcdir = /home/kukuk/pakete/svn/pam-config/trunk
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -143,7 +143,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /data/kukuk/pakete/svn/pam-config/trunk/install-sh
+install_sh = $(SHELL) /home/kukuk/pakete/svn/pam-config/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pam-config-0.79/tests/pam-config.test/Makefile
new/pam-config-0.80/tests/pam-config.test/Makefile
--- old/pam-config-0.79/tests/pam-config.test/Makefile 2011-05-10
12:58:57.000000000 +0200
+++ new/pam-config-0.80/tests/pam-config.test/Makefile 2012-04-03
16:03:50.000000000 +0200
@@ -49,11 +49,11 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
aclocal-1.10
-AMTAR = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run tar
-AUTOCONF = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
autoconf
-AUTOHEADER = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
autoheader
-AUTOMAKE = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
automake-1.10
+ACLOCAL = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
aclocal-1.10
+AMTAR = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
autoconf
+AUTOHEADER = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
autoheader
+AUTOMAKE = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
automake-1.10
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -87,11 +87,11 @@
LTLIBICONV = -liconv
LTLIBINTL =
LTLIBOBJS =
-MAKEINFO = ${SHELL} /data/kukuk/pakete/svn/pam-config/trunk/missing --run
makeinfo
+MAKEINFO = ${SHELL} /home/kukuk/pakete/svn/pam-config/trunk/missing --run
makeinfo
MKDIR_P = /bin/mkdir -p
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
+MSGMERGE = :
OBJEXT = o
PACKAGE = pam-config
PACKAGE_BUGREPORT =
@@ -106,17 +106,17 @@
SHELL = /bin/sh
STRIP =
USE_NLS = yes
-VERSION = 0.79
-XGETTEXT = /usr/bin/xgettext
-XGETTEXT_015 = /usr/bin/xgettext
+VERSION = 0.80
+XGETTEXT = :
+XGETTEXT_015 = :
XMLCATALOG = /usr/bin/xmlcatalog
XMLLINT = /usr/bin/xmllint
XML_CATALOG_FILE = /etc/xml/catalog
XSLTPROC = /usr/bin/xsltproc
-abs_builddir = /data/kukuk/pakete/svn/pam-config/trunk/tests/pam-config.test
-abs_srcdir = /data/kukuk/pakete/svn/pam-config/trunk/tests/pam-config.test
-abs_top_builddir = /data/kukuk/pakete/svn/pam-config/trunk
-abs_top_srcdir = /data/kukuk/pakete/svn/pam-config/trunk
+abs_builddir = /home/kukuk/pakete/svn/pam-config/trunk/tests/pam-config.test
+abs_srcdir = /home/kukuk/pakete/svn/pam-config/trunk/tests/pam-config.test
+abs_top_builddir = /home/kukuk/pakete/svn/pam-config/trunk
+abs_top_srcdir = /home/kukuk/pakete/svn/pam-config/trunk
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -143,7 +143,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /data/kukuk/pakete/svn/pam-config/trunk/install-sh
+install_sh = $(SHELL) /home/kukuk/pakete/svn/pam-config/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale

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

< Previous Next >
This Thread
  • No further messages