-if (!ugid->uid_set || /* Either there's no uid, or */
- (!rdata->isfile && /* We've got the data, and */
- rda_is_filter(data) == FILTER_FORWARD && /* It's not a filter script, */
- Ustrstr(data, ":include:") == NULL)) /* and there's no :include: */
- return rda_extract(rdata, options, include_directory,
- sieve_vacation_directory, sieve_enotify_mailto_owner, sieve_useraddress,
- sieve_subaddress, generated, error, eblockp, filtertype);
+if ( !ugid->uid_set /* Either there's no uid, or */
+ || ( !rdata->isfile /* We've got the data, and */
+ && rda_is_filter(data) == FILTER_FORWARD /* It's not a filter script, */
+ && Ustrstr(data, ":include:") == NULL /* and there's no :include: */
+ ) )
+ return rda_extract(rdata, options, include_directory, sieve,
+ generated, error, eblockp, filtertype);