diff options
Diffstat (limited to 'modules/pam_setquota')
| -rw-r--r-- | modules/pam_setquota/Makefile.in | 34 | ||||
| -rw-r--r-- | modules/pam_setquota/README | 6 | ||||
| -rw-r--r-- | modules/pam_setquota/pam_setquota.8 | 10 | ||||
| -rw-r--r-- | modules/pam_setquota/pam_setquota.8.xml | 10 | ||||
| -rw-r--r-- | modules/pam_setquota/pam_setquota.c | 4 |
5 files changed, 34 insertions, 30 deletions
diff --git a/modules/pam_setquota/Makefile.in b/modules/pam_setquota/Makefile.in index c7e66dad..f4f49f02 100644 --- a/modules/pam_setquota/Makefile.in +++ b/modules/pam_setquota/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,18 +92,21 @@ host_triplet = @host@ @HAVE_VERSIONING_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/../modules.map subdir = modules/pam_setquota ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ - $(top_srcdir)/m4/japhar_grep_cflags.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/attribute.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/intlmacosx.m4 \ $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/ld-no-undefined.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/ld-no-undefined.m4 \ + $(top_srcdir)/m4/ld-z-now.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libprelude.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/warn_lang_flags.m4 \ + $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \ @@ -369,6 +372,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -413,6 +417,9 @@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CRYPTO_LIBS = @CRYPTO_LIBS@ +CRYPT_CFLAGS = @CRYPT_CFLAGS@ +CRYPT_LIBS = @CRYPT_LIBS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -426,6 +433,8 @@ ECONF_CFLAGS = @ECONF_CFLAGS@ ECONF_LIBS = @ECONF_LIBS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +EXE_CFLAGS = @EXE_CFLAGS@ +EXE_LDFLAGS = @EXE_LDFLAGS@ FGREP = @FGREP@ FO2PDF = @FO2PDF@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ @@ -445,7 +454,6 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBAUDIT = @LIBAUDIT@ -LIBCRACK = @LIBCRACK@ LIBCRYPT = @LIBCRYPT@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ @@ -492,8 +500,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PIE_CFLAGS = @PIE_CFLAGS@ -PIE_LDFLAGS = @PIE_LDFLAGS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -504,6 +510,7 @@ SECUREDIR = @SECUREDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRINGPARAM_HMAC = @STRINGPARAM_HMAC@ STRINGPARAM_VENDORDIR = @STRINGPARAM_VENDORDIR@ STRIP = @STRIP@ TIRPC_CFLAGS = @TIRPC_CFLAGS@ @@ -553,7 +560,6 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -libc_cv_fpie = @libc_cv_fpie@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -561,9 +567,6 @@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pam_cv_ld_O1 = @pam_cv_ld_O1@ -pam_cv_ld_as_needed = @pam_cv_ld_as_needed@ -pam_cv_ld_no_undefined = @pam_cv_ld_no_undefined@ pam_xauth_path = @pam_xauth_path@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -573,6 +576,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdunitdir = @systemdunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -908,7 +912,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ diff --git a/modules/pam_setquota/README b/modules/pam_setquota/README index dbab1ccc..fd00da7d 100644 --- a/modules/pam_setquota/README +++ b/modules/pam_setquota/README @@ -31,7 +31,7 @@ startuid=1000 Describe the start of the UID range the policy is applied to. (Defaults to UID_MIN from login.defs or the uidmin value defined at compile-time if - UID_MIN is undefined) + UID_MIN is undefined.) enduid=0 @@ -75,6 +75,6 @@ AUTHOR pam_setquota was originally written by Ruslan Savchenko <savrus@mexmat.net>. -Further modifications were made by Shane Tzen<shane@ict.usc.edu>, Sven Hartge -<sven@svenharte.de> and Keller Fuchs <kellerfuchs@hashbang.sh> +Further modifications were made by Shane Tzen <shane@ict.usc.edu>, Sven Hartge +<sven@svenhartge.de> and Keller Fuchs <kellerfuchs@hashbang.sh>. diff --git a/modules/pam_setquota/pam_setquota.8 b/modules/pam_setquota/pam_setquota.8 index a4222bf3..f09ba960 100644 --- a/modules/pam_setquota/pam_setquota.8 +++ b/modules/pam_setquota/pam_setquota.8 @@ -2,12 +2,12 @@ .\" Title: pam_setquota .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 06/08/2020 +.\" Date: 09/03/2021 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" -.TH "PAM_SETQUOTA" "8" "06/08/2020" "Linux-PAM Manual" "Linux\-PAM Manual" +.TH "PAM_SETQUOTA" "8" "09/03/2021" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -60,7 +60,7 @@ be unset\&. (Defaults to 0) .PP \fBstartuid=\fR\fB\fI1000\fR\fR .RS 4 -Describe the start of the UID range the policy is applied to\&. (Defaults to UID_MIN from login\&.defs or the uidmin value defined at compile\-time if UID_MIN is undefined) +Describe the start of the UID range the policy is applied to\&. (Defaults to UID_MIN from login\&.defs or the uidmin value defined at compile\-time if UID_MIN is undefined\&.) .RE .PP \fBenduid=\fR\fB\fI0\fR\fR @@ -130,7 +130,7 @@ The quota was set successfully\&. .PP PAM_IGNORE .RS 4 -No action was taken because either the UID of the user was outside of the specifed range, a quota already existed and +No action was taken because either the UID of the user was outside of the specified range, a quota already existed and \fBoverwrite=1\fR was not configured or no limits were configured at all\&. .RE @@ -183,4 +183,4 @@ A single invocation of `pam_setquota` applies a specific policy to a UID range\& .PP pam_setquota was originally written by Ruslan Savchenko <savrus@mexmat\&.net>\&. .PP -Further modifications were made by Shane Tzen<shane@ict\&.usc\&.edu>, Sven Hartge <sven@svenharte\&.de> and Keller Fuchs <kellerfuchs@hashbang\&.sh> +Further modifications were made by Shane Tzen <shane@ict\&.usc\&.edu>, Sven Hartge <sven@svenhartge\&.de> and Keller Fuchs <kellerfuchs@hashbang\&.sh>\&. diff --git a/modules/pam_setquota/pam_setquota.8.xml b/modules/pam_setquota/pam_setquota.8.xml index bb878e8c..fe83c805 100644 --- a/modules/pam_setquota/pam_setquota.8.xml +++ b/modules/pam_setquota/pam_setquota.8.xml @@ -109,7 +109,7 @@ <para> Describe the start of the UID range the policy is applied to. (Defaults to UID_MIN from login.defs or the uidmin value defined - at compile-time if UID_MIN is undefined) + at compile-time if UID_MIN is undefined.) </para> </listitem> </varlistentry> @@ -210,7 +210,7 @@ <listitem> <para> No action was taken because either the UID of the user was outside - of the specifed range, a quota already existed and + of the specified range, a quota already existed and <option>overwrite=1</option> was not configured or no limits were configured at all. </para> @@ -292,9 +292,9 @@ Ruslan Savchenko <savrus@mexmat.net>. </para> <para> - Further modifications were made by Shane Tzen<shane@ict.usc.edu>, - Sven Hartge <sven@svenharte.de> - and Keller Fuchs <kellerfuchs@hashbang.sh> + Further modifications were made by Shane Tzen <shane@ict.usc.edu>, + Sven Hartge <sven@svenhartge.de> + and Keller Fuchs <kellerfuchs@hashbang.sh>. </para> </refsect1> diff --git a/modules/pam_setquota/pam_setquota.c b/modules/pam_setquota/pam_setquota.c index 01b05e38..ec45baac 100644 --- a/modules/pam_setquota/pam_setquota.c +++ b/modules/pam_setquota/pam_setquota.c @@ -288,7 +288,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, "with suffix=\"%s\" on device=\"%s\"", pwd->pw_dir, mnt->mnt_dir, s, mntdevice); } - /* param.fs has been specified, find exactly matching fileystem */ + /* param.fs has been specified, find exactly matching filesystem */ } else if ((strncmp(param.fs, mnt->mnt_dir, param.fs_len) == 0 && mnt->mnt_dir[param.fs_len] == '\0') || (strncmp(param.fs, mnt->mnt_fsname, param.fs_len) == 0 @@ -332,7 +332,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, /* Parse new limits * Exit with an error should only the hard- or softlimit be * configured but not both. - * This avoids errors, inconsistencies and possible race conditons + * This avoids errors, inconsistencies and possible race conditions * during setquota. */ ndqblk.dqb_valid = 0; |