Rel 10; log apparmor hat name earlier

diff --git a/pure-ftpd-apparmor.patch b/pure-ftpd-apparmor.patch
index 2844f446079501379d3893cea2c67dcd347f9fd7..74bbf2782c9d1b0ec5cd050c7d04da7883f5210f 100644 (file)
--- a/pure-ftpd-apparmor.patch
+++ b/pure-ftpd-apparmor.patch
@@ -84,9 +84,9 @@ diff -ur pure-ftpd-1.0.49.org/src/ftpd.c pure-ftpd-1.0.49/src/ftpd.c
 +
 +#ifdef APPARMOR
 +    if (authresult.apparmor_hat != NULL) {
++        logfile(LOG_INFO, MSG_APPARMOR_HAT, account, authresult.apparmor_hat);
 +        if (change_hat(authresult.apparmor_hat, zrand()) < 0)
 +            die(421, LOG_ERR, MSG_APPARMOR_FAILED);
-+        logfile(LOG_INFO, MSG_APPARMOR_HAT, account, authresult.apparmor_hat);
 +        free(authresult.apparmor_hat);
 +    }
 +#endif

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 5ad4e085c12708f763a4e1dcbff1bc98150895f0..206695248aba330c63354ed0fb40b6f268f5c421 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 
-%define        rel     9
+%define        rel     10
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd