diff options
| author | Jeremy Allison <jra@samba.org> | 1997-12-23 07:15:59 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-12-23 07:15:59 +0000 |
| commit | d1e796d8577a666e5ef14f9bb462c080300dca3e (patch) | |
| tree | 49a485ff08054c613b585c741d11f7dfbc197c0c /source3/smbd | |
| parent | 74c807fcc5a02a5a5b0ea06ddf2bc65e85938716 (diff) | |
| download | samba-d1e796d8577a666e5ef14f9bb462c080300dca3e.tar.gz samba-d1e796d8577a666e5ef14f9bb462c080300dca3e.tar.bz2 samba-d1e796d8577a666e5ef14f9bb462c080300dca3e.zip | |
Fixes to compile under OpenBSD from "Todd T. Fries" <toddf@acm.org>
Jeremy.
(This used to be commit 3c9292505914e2119fa7b1973c9fbbe1742262b2)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/quotas.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index 562d8fd5db..8333fa7cf2 100644 --- a/source3/smbd/quotas.c +++ b/source3/smbd/quotas.c @@ -546,7 +546,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) #else -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__OpenBSD__) #include <ufs/ufs/quota.h> #include <machine/param.h> #elif AIX @@ -556,7 +556,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) #define dqb_curfiles dqb_curinodes #define dqb_fhardlimit dqb_ihardlimit #define dqb_fsoftlimit dqb_isoftlimit -#else /* !__FreeBSD__ && !AIX */ +#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ #include <sys/quota.h> #include <devnm.h> #endif @@ -569,7 +569,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) uid_t euser_id; int r; struct dqblk D; -#if !defined(__FreeBSD__) && !defined(AIX) +#if !defined(__FreeBSD__) && !defined(AIX) && !defined(__OpenBSD__) char dev_disk[256]; struct stat S; /* find the block device file */ @@ -591,7 +591,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) DEBUG(5,("Unable to reset uid to %d\n", user_id)); } #else /* USE_SETRES */ -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) { /* FreeBSD patches from Marty Moll <martym@arbor.edu> */ uid_t user_id; @@ -615,17 +615,17 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) /* AIX has both USER and GROUP quotas: Get the USER quota (ohnielse@fysik.dtu.dk) */ r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D); -#else /* !__FreeBSD__ && !AIX */ +#else /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D); -#endif /* !__FreeBSD__ && !AIX */ +#endif /* !__FreeBSD__ && !AIX && !__OpenBSD__ */ #endif /* USE_SETRES */ /* Use softlimit to determine disk space, except when it has been exceeded */ -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) *bsize = DEV_BSIZE; -#else /* !__FreeBSD__ */ +#else /* !__FreeBSD__ && !__OpenBSD__ */ *bsize = 1024; -#endif /*!__FreeBSD__ */ +#endif /*!__FreeBSD__ && !__OpenBSD__ */ if (r) { @@ -641,7 +641,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) return(False); /* Use softlimit to determine disk space, except when it has been exceeded */ if ((D.dqb_curblocks>D.dqb_bsoftlimit) -#if !defined(__FreeBSD__) +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) ||((D.dqb_curfiles>D.dqb_fsoftlimit) && (D.dqb_fsoftlimit != 0)) #endif ) { |