diff options
| author | Markus Fischer <mfischer@php.net> | 2002-03-19 22:47:37 +0000 |
|---|---|---|
| committer | Markus Fischer <mfischer@php.net> | 2002-03-19 22:47:37 +0000 |
| commit | 7bf57c999cc70f785fa4e5aeec2b20e2746324e4 (patch) | |
| tree | 14bd101abb14e5488cc0184c9200da3eff2e231d /ext/vpopmail/php_vpopmail.c | |
| parent | a62b31f6b7502a2cc95c1617e5ccddd01571a91b (diff) | |
| download | php-git-7bf57c999cc70f785fa4e5aeec2b20e2746324e4.tar.gz | |
- Support vpopmail 5.2 (fixes #16120).
Diffstat (limited to 'ext/vpopmail/php_vpopmail.c')
| -rw-r--r-- | ext/vpopmail/php_vpopmail.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/vpopmail/php_vpopmail.c b/ext/vpopmail/php_vpopmail.c index 48deac8ba0..209593bfa8 100644 --- a/ext/vpopmail/php_vpopmail.c +++ b/ext/vpopmail/php_vpopmail.c @@ -285,7 +285,11 @@ PHP_FUNCTION(vpopmail_add_alias_domain) RETURN_FALSE; } +#if (!defined(HAVE_VPOPMAIL_API) || HAVE_VPOPMAIL_API == 1) if (add_domain_assign(Z_STRVAL_PP(aliasdomain), Dir, uid, gid) != 1) { +#else + if (add_domain_assign(Z_STRVAL_PP(aliasdomain), Z_STRVAL_PP(domain), Dir, uid, gid) != 1) { +#endif php_error(E_WARNING, "vpopmail_addaliasdomain could not add domain to control files"); VPOPMAILG(vpopmail_errno) = 1; RETURN_FALSE; @@ -922,7 +926,7 @@ PHP_FUNCTION(vpopmail_error) } /* }}} */ -#endif HAVE_VPOPMAIL +#endif /* HAVE_VPOPMAIL */ /* * Local variables: |