Rel 5; pure-uploadscript retval has meaning only if it is enabled

diff --git a/pure-ftpd.init b/pure-ftpd.init
index 2805f1ede806b5328155c3976b166a2766c1826c..43a356866d3405f6d8d7887a955d9ba0eaf2ea1d 100644 (file)
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -133,9 +133,14 @@ case "$1" in
        ;;
   status)
        status pure-ftpd
        ;;
   status)
        status pure-ftpd

-       status pure-uploadscript

        RETVAL=$?
        RETVAL=$?

-       if [ $RETVAL -eq 0 ]; then
+       PUREFTPDRETVAL=$RETVAL
+
+       status pure-uploadscript
+       if [ -n "$UPLOADSCRIPT" ]; then
+         RETVAL=$?
+       fi
+       if [ $PUREFTPDRETVAL -eq 0 ]; then

                pure-ftpwho
        fi
        ;;
                pure-ftpwho
        fi
        ;;

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index a2b2071f35ed2b40ba0adff9c922b895dad4adab..9c09bbd69ae075d0766612f6f6f402d400253421 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
 
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 

-%define        rel     4
+%define        rel     5

 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd