You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2009/05/22 18:41:41 UTC
svn commit: r777612 - /httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
Author: jim
Date: Fri May 22 16:41:41 2009
New Revision: 777612
URL: http://svn.apache.org/viewvc?rev=777612&view=rev
Log:
Cleanup a bit...
Modified:
httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c?rev=777612&r1=777611&r2=777612&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c Fri May 22 16:41:41 2009
@@ -88,7 +88,9 @@
#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
if (geteuid() == 0) {
int ign;
-#if MODULE_MAGIC_NUMBER_MAJOR > 20081212
+#if MODULE_MAGIC_NUMBER_MAJOR <= 20081212
+#define ap_unixd_config unixd_config
+#endif
ign = chown(fsc->limitdbfile, ap_unixd_config.user_id, -1);
ign = chown(apr_pstrcat(p, fsc->limitdbfile, ".LoCK", NULL),
ap_unixd_config.user_id, -1);
@@ -98,17 +100,6 @@
ap_unixd_config.user_id, -1);
ign = chown(apr_pstrcat(p, fsc->limitdbfile, ".pag", NULL),
ap_unixd_config.user_id, -1);
-#else
- ign = chown(fsc->limitdbfile, unixd_config.user_id, -1);
- ign = chown(apr_pstrcat(p, fsc->limitdbfile, ".LoCK", NULL),
- unixd_config.user_id, -1);
- ign = chown(apr_pstrcat(p, fsc->limitdbfile, ".db", NULL),
- unixd_config.user_id, -1);
- ign = chown(apr_pstrcat(p, fsc->limitdbfile, ".dir", NULL),
- unixd_config.user_id, -1);
- ign = chown(apr_pstrcat(p, fsc->limitdbfile, ".pag", NULL),
- unixd_config.user_id, -1);
-#endif
}
#endif
ftp_mutex_off();