summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog7
-rw-r--r--configure.in11
-rw-r--r--mntopt.h1
-rw-r--r--quotaon_xfs.c2
-rw-r--r--quotasys.c6
-rw-r--r--rquota_svc.c12
-rw-r--r--warnquota.c17
7 files changed, 37 insertions, 19 deletions
diff --git a/Changelog b/Changelog
index 4784ae2..aa6837a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,12 @@
Changes in quota-tools from 3.15 to 3.16
+* always define allow_severity and deny_severity for older versions of libwrap (Martin Jacobs)
+* cleaned up host_access() handling (Jan Kara)
+* configure script now correctly reports checking of libwrap (Jan Kara)
+* added MPFS to the list of supported filesystems (Dave Boone)
* all binaries are now stripped during installation (Jan Kara)
+* updated Polish translations (Jakub Bogusz)
+* fixed typo in a quotaon message (Jakub Bogusz)
+* fixed warnquota to check URI only if LDAP enabled (Michael Meskes)
Changes in quota-tools from 3.14 to 3.15
* added a wrapper script around setquota which also updates LDAP (Stefan Adams)
diff --git a/configure.in b/configure.in
index 01d05cf..57426dc 100644
--- a/configure.in
+++ b/configure.in
@@ -139,17 +139,21 @@ AC_SUBST(QUOTA_NETLINK_PROG)
AC_SUBST(NETLINKLIBS)
AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_MSG_CHECKING(for host_access in -lwrap)
AC_CACHE_VAL(ac_cv_lib_wrap_main,
saved_LIBS="$LIBS"
LIBS="$LIBS -lwrap"
- [AC_TRY_LINK([#include <stdio.h>
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <tcpd.h>
struct request_info request;
- int deny_severity, allow_severity;],[hosts_access(&request);],
- [ac_cv_lib_wrap_main=yes],[ac_cv_lib_wrap_main=no;LIBS="$saved_LIBS"])
+ int deny_severity, allow_severity;]],[[hosts_access(&request);]])],
+ dnl We always restore LIBS as we add -lwrap in the next check
+ [ac_cv_lib_wrap_main=yes; LIBS="$saved_LIBS"; AC_MSG_RESULT(yes)],
+ [ac_cv_lib_wrap_main=no; LIBS="$saved_LIBS"; AC_MSG_RESULT(no)])
])
if test ${ac_cv_lib_wrap_main} = yes; then
@@ -157,7 +161,6 @@ if test ${ac_cv_lib_wrap_main} = yes; then
echo 'ERROR: could not find tcpd.h - missing TCP wrappers package'
exit 1
])
- dnl Do this in case value was cached...
LIBS="$LIBS -lwrap"
HOSTS_ACCESS="-DHOSTS_ACCESS"
AC_SUBST(HOSTS_ACCESS)
diff --git a/mntopt.h b/mntopt.h
index f732eda..e714243 100644
--- a/mntopt.h
+++ b/mntopt.h
@@ -15,6 +15,7 @@
#define MNTTYPE_AUTOFS "autofs" /* Automount mountpoint */
#define MNTTYPE_JFS "jfs" /* JFS file system */
#define MNTTYPE_NFS4 "nfs4" /* NFSv4 filesystem */
+#define MNTTYPE_MPFS "mpfs" /* EMC Celerra MPFS filesystem */
/* mount options */
#define MNTOPT_NOQUOTA "noquota" /* don't enforce quota */
diff --git a/quotaon_xfs.c b/quotaon_xfs.c
index 5707619..657edfb 100644
--- a/quotaon_xfs.c
+++ b/quotaon_xfs.c
@@ -114,7 +114,7 @@ static int xfs_state_check(int qcmd, int type, int flags, char *dev, int roothac
return -1;
case Q_XFS_QUOTAOFF:
if (xopts == XFS_QUOTA_UDQ_ACCT || xopts == XFS_QUOTA_GDQ_ACCT) {
- errstr(_("Cannot switch off %s quota"
+ errstr(_("Cannot switch off %s quota "
"accounting on %s when enforcement is on\n"),
type2name(type), dev);
return -1;
diff --git a/quotasys.c b/quotasys.c
index c4f913c..72ce478 100644
--- a/quotasys.c
+++ b/quotasys.c
@@ -43,7 +43,8 @@ static char *fmtnames[] = INITQFMTNAMES;
*/
int nfs_fstype(char *type)
{
- return !strcmp(type, MNTTYPE_NFS) || !strcmp(type, MNTTYPE_NFS4);
+ return !strcmp(type, MNTTYPE_NFS) || !strcmp(type, MNTTYPE_NFS4) ||
+ !strcmp(type, MNTTYPE_MPFS);
}
/*
@@ -69,7 +70,8 @@ static int correct_fstype(char *type)
!strcmp(type, MNTTYPE_REISER) ||
!strcmp(type, MNTTYPE_XFS) ||
!strcmp(type, MNTTYPE_NFS) ||
- !strcmp(type, MNTTYPE_NFS4)) {
+ !strcmp(type, MNTTYPE_NFS4) ||
+ !strcmp(type, MNTTYPE_MPFS)) {
free(mtype);
return 1;
}
diff --git a/rquota_svc.c b/rquota_svc.c
index 08ebefa..5872464 100644
--- a/rquota_svc.c
+++ b/rquota_svc.c
@@ -12,7 +12,7 @@
* changes for new utilities by Jan Kara <jack@suse.cz>
* patches by Jani Jaakkola <jjaakkol@cs.helsinki.fi>
*
- * Version: $Id: rquota_svc.c,v 1.17 2005/06/01 07:20:50 jkar8572 Exp $
+ * Version: $Id: rquota_svc.c,v 1.18 2007/08/22 13:03:24 jkar8572 Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -36,6 +36,8 @@
#ifdef HOSTS_ACCESS
#include <tcpd.h>
#include <netdb.h>
+
+int deny_severity, allow_severity; /* Needed by some versions of libwrap */
#endif
#ifdef __STDC__
@@ -173,7 +175,7 @@ int good_client(struct sockaddr_in *addr, ulong rq_proc)
struct hostent *h;
char *name, **ad;
#endif
- const char *remote=inet_ntoa(addr->sin_addr);
+ char *remote = inet_ntoa(addr->sin_addr);
if (rq_proc==RQUOTAPROC_SETQUOTA ||
rq_proc==RQUOTAPROC_SETACTIVEQUOTA) {
@@ -213,13 +215,13 @@ int good_client(struct sockaddr_in *addr, ulong rq_proc)
if (!memcmp(*ad, &(addr->sin_addr), h->h_length))
break;
if (!*ad) /* Our address not found? */
- goto denied;
+ goto denied;
/* Check host name */
- if (hosts_ctl("rquotad", "", h->h_name, ""))
+ if (hosts_ctl("rquotad", h->h_name, remote, ""))
return 1;
/* Check aliases */
for (ad = h->h_aliases; *ad; ad++)
- if (hosts_ctl("rquotad", "", *ad, ""))
+ if (hosts_ctl("rquotad", *ad, remote, ""))
return 1;
denied:
errstr(_("Denied access to host %s\n"), remote);
diff --git a/warnquota.c b/warnquota.c
index d178791..1456da7 100644
--- a/warnquota.c
+++ b/warnquota.c
@@ -10,7 +10,7 @@
*
* Author: Marco van Wieringen <mvw@planets.elm.net>
*
- * Version: $Id: warnquota.c,v 1.28 2007/05/29 14:17:56 jkar8572 Exp $
+ * Version: $Id: warnquota.c,v 1.29 2007/08/22 13:03:24 jkar8572 Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -842,15 +842,18 @@ cc_parse_err:
if (bufpos)
errstr(_("Unterminated last line, ignoring\n"));
#ifdef USE_LDAP_MAIL_LOOKUP
+ if (config->use_ldap_mail)
+ {
#ifdef USE_LDAP_23
- if (!config->ldap_uri[0]) {
- snprintf(config->ldap_uri, CNF_BUFFER, "ldap://%s:%d", config->ldap_host, config->ldap_port);
- errstr(_("LDAP library version >= 2.3 detected. Please use LDAP_URI instead of hostname and port.\nGenerated URI %s\n"), config->ldap_uri);
- }
+ if (!config->ldap_uri[0]) {
+ snprintf(config->ldap_uri, CNF_BUFFER, "ldap://%s:%d", config->ldap_host, config->ldap_port);
+ errstr(_("LDAP library version >= 2.3 detected. Please use LDAP_URI instead of hostname and port.\nGenerated URI %s\n"), config->ldap_uri);
+ }
#else
- if (config->ldap_uri[0])
- die(1, _("LDAP library does not support ldap_initialize() but URI is specified."));
+ if (config->ldap_uri[0])
+ die(1, _("LDAP library does not support ldap_initialize() but URI is specified."));
#endif
+ }
#endif
fclose(fp);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 00:41:41 +0000