forked from pool/proftpd
bf3eecb6ff
fix config, remove obsolete option OBS-URL: https://build.opensuse.org/request/show/1000746 OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=87
78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
Index: contrib/dist/rpm/ftp.pamd
|
|
===================================================================
|
|
--- contrib/dist/rpm/ftp.pamd.orig
|
|
+++ contrib/dist/rpm/ftp.pamd
|
|
@@ -1,6 +1,7 @@
|
|
#%PAM-1.0
|
|
+
|
|
auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
|
|
-auth required pam_unix.so shadow nullok
|
|
+#auth required pam_unix.so shadow nullok
|
|
|
|
# If this is enabled, anonymous logins will fail because the 'ftp' user does
|
|
# not have a "valid" shell, as listed in /etc/shells.
|
|
@@ -11,5 +12,9 @@ auth required pam_unix.so shadow n
|
|
#
|
|
#auth required pam_shells.so
|
|
|
|
-account required pam_unix.so
|
|
-session required pam_unix.so
|
|
+auth required pam_unix2.so
|
|
+auth required pam_shells.so
|
|
+account required pam_unix2.so
|
|
+password required pam_unix2.so
|
|
+session required pam_unix2.so
|
|
+session optional pam_keyinit.so revoke
|
|
Index: contrib/dist/rpm/proftpd.logrotate
|
|
===================================================================
|
|
--- contrib/dist/rpm/proftpd.logrotate.orig
|
|
+++ contrib/dist/rpm/proftpd.logrotate
|
|
@@ -1,10 +1,15 @@
|
|
-/var/log/proftpd/*.log /var/log/xferlog {
|
|
+/var/log/proftpd/xferlog /var/log/proftpd/*.log {
|
|
compress
|
|
- missingok
|
|
+ dateext
|
|
+ maxage 365
|
|
+ rotate 99
|
|
+ size=+4096k
|
|
notifempty
|
|
+ missingok
|
|
+ create 640 root root
|
|
sharedscripts
|
|
postrotate
|
|
- test -f /var/lock/subsys/proftpd && /usr/bin/killall -HUP proftpd || :
|
|
+ /usr/sbin/rcproftpd reload
|
|
endscript
|
|
}
|
|
|
|
Index: contrib/dist/rpm/xinetd
|
|
===================================================================
|
|
--- contrib/dist/rpm/xinetd.orig
|
|
+++ contrib/dist/rpm/xinetd
|
|
@@ -2,13 +2,15 @@
|
|
# description: The ProFTPD FTP server
|
|
service ftp
|
|
{
|
|
- flags = REUSE
|
|
- socket_type = stream
|
|
- wait = no
|
|
- user = root
|
|
- server = /usr/sbin/in.proftpd
|
|
- log_on_success += DURATION
|
|
- log_on_failure += USERID
|
|
- nice = 10
|
|
- disable = yes
|
|
+ socket_type = stream
|
|
+ protocol = tcp
|
|
+ wait = no
|
|
+# bind = IP
|
|
+ instances = 30
|
|
+ user = root
|
|
+ server = /usr/sbin/in.proftpd
|
|
+ log_on_success += PID HOST USERID EXIT DURATION
|
|
+ log_on_failure += HOST USERID ATTEMPT
|
|
+# nice = 10
|
|
+ disable = yes
|
|
}
|