diff options
Diffstat (limited to 'modules/pam_mkhomedir')
| -rw-r--r-- | modules/pam_mkhomedir/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/Makefile.in | 15 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/README.xml | 29 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/mkhomedir_helper.8 | 8 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/mkhomedir_helper.8.xml | 29 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/mkhomedir_helper.c | 3 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/pam_mkhomedir.8 | 16 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/pam_mkhomedir.8.xml | 49 | ||||
| -rw-r--r-- | modules/pam_mkhomedir/pam_mkhomedir.c | 18 |
9 files changed, 83 insertions, 88 deletions
diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am index 04da1dcc..e0f80a96 100644 --- a/modules/pam_mkhomedir/Makefile.am +++ b/modules/pam_mkhomedir/Makefile.am @@ -16,7 +16,11 @@ dist_check_SCRIPTS = tst-pam_mkhomedir TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS) securelibdir = $(SECUREDIR) +if HAVE_VENDORDIR +secureconfdir = $(VENDOR_SCONFIGDIR) +else secureconfdir = $(SCONFIGDIR) +endif AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" $(WARN_CFLAGS) diff --git a/modules/pam_mkhomedir/Makefile.in b/modules/pam_mkhomedir/Makefile.in index 163531e8..3e5cb170 100644 --- a/modules/pam_mkhomedir/Makefile.in +++ b/modules/pam_mkhomedir/Makefile.in @@ -455,6 +455,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCBOOK_RNG = @DOCBOOK_RNG@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -467,11 +468,13 @@ EXEEXT = @EXEEXT@ EXE_CFLAGS = @EXE_CFLAGS@ EXE_LDFLAGS = @EXE_LDFLAGS@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FO2PDF = @FO2PDF@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +HTML_STYLESHEET = @HTML_STYLESHEET@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -503,12 +506,14 @@ LIBSELINUX = @LIBSELINUX@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOGIND_CFLAGS = @LOGIND_CFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_STYLESHEET = @MAN_STYLESHEET@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -531,6 +536,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDF_STYLESHEET = @PDF_STYLESHEET@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -541,12 +547,16 @@ SECUREDIR = @SECUREDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STRINGPARAM_HMAC = @STRINGPARAM_HMAC@ +STRINGPARAM_PROFILECONDITIONS = @STRINGPARAM_PROFILECONDITIONS@ STRINGPARAM_VENDORDIR = @STRINGPARAM_VENDORDIR@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ TIRPC_CFLAGS = @TIRPC_CFLAGS@ TIRPC_LIBS = @TIRPC_LIBS@ +TXT_STYLESHEET = @TXT_STYLESHEET@ USE_NLS = @USE_NLS@ +VENDOR_SCONFIGDIR = @VENDOR_SCONFIGDIR@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ @@ -620,7 +630,8 @@ XMLS = README.xml pam_mkhomedir.8.xml mkhomedir_helper.8.xml dist_check_SCRIPTS = tst-pam_mkhomedir TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS) securelibdir = $(SECUREDIR) -secureconfdir = $(SCONFIGDIR) +@HAVE_VENDORDIR_FALSE@secureconfdir = $(SCONFIGDIR) +@HAVE_VENDORDIR_TRUE@secureconfdir = $(VENDOR_SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" $(WARN_CFLAGS) diff --git a/modules/pam_mkhomedir/README.xml b/modules/pam_mkhomedir/README.xml index 978cbe77..ef998956 100644 --- a/modules/pam_mkhomedir/README.xml +++ b/modules/pam_mkhomedir/README.xml @@ -1,36 +1,23 @@ -<?xml version="1.0" encoding='UTF-8'?> -<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" -"http://www.docbook.org/xml/4.3/docbookx.dtd" -[ -<!-- -<!ENTITY pamaccess SYSTEM "pam_mkhomedir.8.xml"> ---> -]> +<article xmlns="http://docbook.org/ns/docbook" version="5.0"> -<article> - - <articleinfo> + <info> <title> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="pam_mkhomedir.8.xml" xpointer='xpointer(//refnamediv[@id = "pam_mkhomedir-name"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_mkhomedir.8.xml" xpointer='xpointer(id("pam_mkhomedir-name")/*)'/> </title> - </articleinfo> + </info> <section> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="pam_mkhomedir.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mkhomedir-description"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_mkhomedir.8.xml" xpointer='xpointer(id("pam_mkhomedir-description")/*)'/> </section> <section> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="pam_mkhomedir.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mkhomedir-examples"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_mkhomedir.8.xml" xpointer='xpointer(id("pam_mkhomedir-examples")/*)'/> </section> <section> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" - href="pam_mkhomedir.8.xml" xpointer='xpointer(//refsect1[@id = "pam_mkhomedir-author"]/*)'/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pam_mkhomedir.8.xml" xpointer='xpointer(id("pam_mkhomedir-author")/*)'/> </section> -</article> +</article>
\ No newline at end of file diff --git a/modules/pam_mkhomedir/mkhomedir_helper.8 b/modules/pam_mkhomedir/mkhomedir_helper.8 index a9e68a0e..7f5e6160 100644 --- a/modules/pam_mkhomedir/mkhomedir_helper.8 +++ b/modules/pam_mkhomedir/mkhomedir_helper.8 @@ -1,13 +1,13 @@ '\" t .\" Title: mkhomedir_helper .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 09/03/2021 +.\" Generator: DocBook XSL Stylesheets v1.79.2 <http://docbook.sf.net/> +.\" Date: 05/07/2023 .\" Manual: Linux-PAM Manual -.\" Source: Linux-PAM Manual +.\" Source: Linux-PAM .\" Language: English .\" -.TH "MKHOMEDIR_HELPER" "8" "09/03/2021" "Linux-PAM Manual" "Linux\-PAM Manual" +.TH "MKHOMEDIR_HELPER" "8" "05/07/2023" "Linux\-PAM" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/modules/pam_mkhomedir/mkhomedir_helper.8.xml b/modules/pam_mkhomedir/mkhomedir_helper.8.xml index 8a76f2d6..0f4c4b40 100644 --- a/modules/pam_mkhomedir/mkhomedir_helper.8.xml +++ b/modules/pam_mkhomedir/mkhomedir_helper.8.xml @@ -1,31 +1,28 @@ -<?xml version="1.0" encoding='UTF-8'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> - -<refentry id="mkhomedir_helper"> +<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="mkhomedir_helper"> <refmeta> <refentrytitle>mkhomedir_helper</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class="sectdesc">Linux-PAM Manual</refmiscinfo> + <refmiscinfo class="source">Linux-PAM</refmiscinfo> + <refmiscinfo class="manual">Linux-PAM Manual</refmiscinfo> </refmeta> - <refnamediv id="mkhomedir_helper-name"> + <refnamediv xml:id="mkhomedir_helper-name"> <refname>mkhomedir_helper</refname> <refpurpose>Helper binary that creates home directories</refpurpose> </refnamediv> <refsynopsisdiv> - <cmdsynopsis id="mkhomedir_helper-cmdsynopsis"> + <cmdsynopsis xml:id="mkhomedir_helper-cmdsynopsis" sepchar=" "> <command>mkhomedir_helper</command> - <arg choice="req"> + <arg choice="req" rep="norepeat"> <replaceable>user</replaceable> </arg> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> <replaceable>umask</replaceable> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> <replaceable>path-to-skel</replaceable> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> <replaceable>home_mode</replaceable> </arg> </arg> @@ -33,7 +30,7 @@ </cmdsynopsis> </refsynopsisdiv> - <refsect1 id="mkhomedir_helper-description"> + <refsect1 xml:id="mkhomedir_helper-description"> <title>DESCRIPTION</title> @@ -63,7 +60,7 @@ </para> </refsect1> - <refsect1 id='mkhomedir_helper-see_also'> + <refsect1 xml:id="mkhomedir_helper-see_also"> <title>SEE ALSO</title> <para> <citerefentry> @@ -72,7 +69,7 @@ </para> </refsect1> - <refsect1 id='mkhomedir_helper-author'> + <refsect1 xml:id="mkhomedir_helper-author"> <title>AUTHOR</title> <para> Written by Tomas Mraz based on the code originally in @@ -80,4 +77,4 @@ </para> </refsect1> -</refentry> +</refentry>
\ No newline at end of file diff --git a/modules/pam_mkhomedir/mkhomedir_helper.c b/modules/pam_mkhomedir/mkhomedir_helper.c index 582fecce..3213f028 100644 --- a/modules/pam_mkhomedir/mkhomedir_helper.c +++ b/modules/pam_mkhomedir/mkhomedir_helper.c @@ -184,8 +184,7 @@ create_homedir(const struct passwd *pwd, else pointed[pointedlen] = 0; #else - char pointed[PATH_MAX]; - memset(pointed, 0, sizeof(pointed)); + char pointed[PATH_MAX] = {}; pointedlen = readlink(newsource, pointed, sizeof(pointed) - 1); #endif diff --git a/modules/pam_mkhomedir/pam_mkhomedir.8 b/modules/pam_mkhomedir/pam_mkhomedir.8 index b8a4754c..112b39b0 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.8 +++ b/modules/pam_mkhomedir/pam_mkhomedir.8 @@ -1,13 +1,13 @@ '\" t .\" Title: pam_mkhomedir .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 09/03/2021 +.\" Generator: DocBook XSL Stylesheets v1.79.2 <http://docbook.sf.net/> +.\" Date: 05/07/2023 .\" Manual: Linux-PAM Manual -.\" Source: Linux-PAM Manual +.\" Source: Linux-PAM .\" Language: English .\" -.TH "PAM_MKHOMEDIR" "8" "09/03/2021" "Linux-PAM Manual" "Linux-PAM Manual" +.TH "PAM_MKHOMEDIR" "8" "05/07/2023" "Linux\-PAM" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -40,18 +40,18 @@ The pam_mkhomedir PAM module will create a users home directory if it does not e The new users home directory will not be removed after logout of the user\&. .SH "OPTIONS" .PP -\fBsilent\fR +silent .RS 4 Don\*(Aqt print informative messages\&. .RE .PP -\fBdebug\fR +debug .RS 4 Turns on debugging via \fBsyslog\fR(3)\&. .RE .PP -\fBumask=\fR\fB\fImask\fR\fR +umask=mask .RS 4 The file mode creation mask is set to \fImask\fR\&. The default value of mask is 0022\&. If this option is not specified, then the permissions of created user home directory is set to the value of @@ -62,7 +62,7 @@ configuration item from in the same file\&. If there is no such configuration option either the default value of 0755 is used for the mode\&. .RE .PP -\fBskel=\fR\fB\fI/path/to/skel/directory\fR\fR +skel=/path/to/skel/directory .RS 4 Indicate an alternative skel diff --git a/modules/pam_mkhomedir/pam_mkhomedir.8.xml b/modules/pam_mkhomedir/pam_mkhomedir.8.xml index 10109067..ad957248 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.8.xml +++ b/modules/pam_mkhomedir/pam_mkhomedir.8.xml @@ -1,16 +1,13 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> - -<refentry id='pam_mkhomedir'> +<refentry xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="pam_mkhomedir"> <refmeta> <refentrytitle>pam_mkhomedir</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class='setdesc'>Linux-PAM Manual</refmiscinfo> + <refmiscinfo class="source">Linux-PAM</refmiscinfo> + <refmiscinfo class="manual">Linux-PAM Manual</refmiscinfo> </refmeta> - <refnamediv id='pam_mkhomedir-name'> + <refnamediv xml:id="pam_mkhomedir-name"> <refname>pam_mkhomedir</refname> <refpurpose> PAM module to create users home directory @@ -20,25 +17,25 @@ <!-- body begins here --> <refsynopsisdiv> - <cmdsynopsis id="pam_mkhomedir-cmdsynopsis"> + <cmdsynopsis xml:id="pam_mkhomedir-cmdsynopsis" sepchar=" "> <command>pam_mkhomedir.so</command> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> silent </arg> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> debug </arg> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> umask=<replaceable>mode</replaceable> </arg> - <arg choice="opt"> + <arg choice="opt" rep="norepeat"> skel=<replaceable>skeldir</replaceable> </arg> </cmdsynopsis> </refsynopsisdiv> - <refsect1 id="pam_mkhomedir-description"> + <refsect1 xml:id="pam_mkhomedir-description"> <title>DESCRIPTION</title> <para> The pam_mkhomedir PAM module will create a users home directory @@ -55,13 +52,13 @@ </para> </refsect1> - <refsect1 id="pam_mkhomedir-options"> + <refsect1 xml:id="pam_mkhomedir-options"> <title>OPTIONS</title> <variablelist> <varlistentry> <term> - <option>silent</option> + silent </term> <listitem> <para> @@ -72,7 +69,7 @@ <varlistentry> <term> - <option>debug</option> + debug </term> <listitem> <para> @@ -86,7 +83,7 @@ <varlistentry> <term> - <option>umask=<replaceable>mask</replaceable></option> + umask=mask </term> <listitem> <para> @@ -106,7 +103,7 @@ <varlistentry> <term> - <option>skel=<replaceable>/path/to/skel/directory</replaceable></option> + skel=/path/to/skel/directory </term> <listitem> <para> @@ -119,14 +116,14 @@ </variablelist> </refsect1> - <refsect1 id="pam_mkhomedir-types"> + <refsect1 xml:id="pam_mkhomedir-types"> <title>MODULE TYPES PROVIDED</title> <para> Only the <option>session</option> module type is provided. </para> </refsect1> - <refsect1 id="pam_mkhomedir-return_values"> + <refsect1 xml:id="pam_mkhomedir-return_values"> <title>RETURN VALUES</title> <variablelist> <varlistentry> @@ -165,11 +162,11 @@ </variablelist> </refsect1> - <refsect1 id="pam_mkhomedir-files"> + <refsect1 xml:id="pam_mkhomedir-files"> <title>FILES</title> <variablelist> <varlistentry> - <term><filename>/etc/skel</filename></term> + <term>/etc/skel</term> <listitem> <para>Default skel directory</para> </listitem> @@ -177,7 +174,7 @@ </variablelist> </refsect1> - <refsect1 id='pam_mkhomedir-examples'> + <refsect1 xml:id="pam_mkhomedir-examples"> <title>EXAMPLES</title> <para> A sample /etc/pam.d/login file: @@ -198,7 +195,7 @@ </refsect1> - <refsect1 id="pam_mkhomedir-see_also"> + <refsect1 xml:id="pam_mkhomedir-see_also"> <title>SEE ALSO</title> <para> <citerefentry> @@ -210,10 +207,10 @@ </para> </refsect1> - <refsect1 id="pam_mkhomedir-author"> + <refsect1 xml:id="pam_mkhomedir-author"> <title>AUTHOR</title> <para> pam_mkhomedir was written by Jason Gunthorpe <jgg@debian.org>. </para> </refsect1> -</refentry> +</refentry>
\ No newline at end of file diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c index 48e578fa..6ddcd5a8 100644 --- a/modules/pam_mkhomedir/pam_mkhomedir.c +++ b/modules/pam_mkhomedir/pam_mkhomedir.c @@ -125,15 +125,6 @@ create_homedir (pam_handle_t *pamh, options_t *opt, D(("called.")); - /* - * This code arranges that the demise of the child does not cause - * the application to receive a signal it is not expecting - which - * may kill the application or worse. - */ - memset(&newsa, '\0', sizeof(newsa)); - newsa.sa_handler = SIG_DFL; - sigaction(SIGCHLD, &newsa, &oldsa); - if (opt->ctrl & MKHOMEDIR_DEBUG) { pam_syslog(pamh, LOG_DEBUG, "Executing mkhomedir_helper."); } @@ -153,6 +144,15 @@ create_homedir (pam_handle_t *pamh, options_t *opt, login_homemode = _pam_conv_str_umask_to_homemode(opt->umask); } + /* + * This code arranges that the demise of the child does not cause + * the application to receive a signal it is not expecting - which + * may kill the application or worse. + */ + memset(&newsa, '\0', sizeof(newsa)); + newsa.sa_handler = SIG_DFL; + sigaction(SIGCHLD, &newsa, &oldsa); + /* fork */ child = fork(); if (child == 0) { |