summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-03 02:20:05 +1000
committerBjoern Jacke <bj@sernet.de>2012-09-06 09:08:57 +0200
commit79bc9e5ace576e67ec14132b9b0c892c642cc98f (patch)
treef12e59a7df1460939105cfec882abc41290c4f6b
parent8b90f6ace30609b320cc306282488b8ee8397d7b (diff)
downloadsamba-79bc9e5ace576e67ec14132b9b0c892c642cc98f.tar.gz
samba-79bc9e5ace576e67ec14132b9b0c892c642cc98f.tar.bz2
samba-79bc9e5ace576e67ec14132b9b0c892c642cc98f.zip
s3-smbd: Remove HPUX support from old (pre-sysquotas) code
This should be essentially dead code, as while it is possible to disable sysquotas, the sysquotas has since 2003 supported the 4A varient used on HPUX. Andrew Bartlett Signed-off-by: Björn Jacke <bj@sernet.de>
-rw-r--r--source3/smbd/quotas.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index adfecfe418..77abb59d98 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -630,32 +630,14 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d
/* find the block device file */
-#ifdef HPUX
- /* Need to set the cache flag to 1 for HPUX. Seems
- * to have a significant performance boost when
- * lstat calls on /dev access this function.
- */
- if ((sys_stat(path, &S, false)<0)
- || (devnm(S_IFBLK, S.st_ex_dev, dev_disk, 256, 1)<0))
-#else
if ((sys_stat(path, &S, false)<0)
|| (devnm(S_IFBLK, S.st_ex_dev, dev_disk, 256, 0)<0))
return (False);
-#endif /* ifdef HPUX */
#endif /* !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) && !defined(__DragonFly__) */
euser_id = geteuid();
-#ifdef HPUX
- /* for HPUX, real uid must be same as euid to execute quotactl for euid */
- save_re_uid();
- if (set_re_uid() != 0) return False;
-
- r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D);
-
- restore_re_uid();
-#else
#if defined(AIX)
/* AIX has both USER and GROUP quotas:
Get the USER quota (ohnielse@fysik.dtu.dk) */
@@ -696,7 +678,6 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d
#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__DragonFly__ */
r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D);
#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__DragonFly__ */
-#endif /* HPUX */
/* Use softlimit to determine disk space, except when it has been exceeded */
*bsize = 1024;