d1373698e2
OBS-URL: https://build.opensuse.org/request/show/66590 OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=1
89 lines
2.8 KiB
Diff
89 lines
2.8 KiB
Diff
diff -Nur proftpd-1.3.3rc3.orig/contrib/dist/rpm/ftp.pamd proftpd-1.3.3rc3/contrib/dist/rpm/ftp.pamd
|
|
--- proftpd-1.3.3rc3.orig/contrib/dist/rpm/ftp.pamd 2007-10-04 04:25:03.000000000 +0200
|
|
+++ proftpd-1.3.3rc3/contrib/dist/rpm/ftp.pamd 2010-02-09 14:40:29.198747815 +0100
|
|
@@ -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,8 @@
|
|
#
|
|
#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
|
|
diff -Nur proftpd-1.3.3rc3.orig/contrib/dist/rpm/proftpd.logrotate proftpd-1.3.3rc3/contrib/dist/rpm/proftpd.logrotate
|
|
--- proftpd-1.3.3rc3.orig/contrib/dist/rpm/proftpd.logrotate 2009-05-27 18:14:24.000000000 +0200
|
|
+++ proftpd-1.3.3rc3/contrib/dist/rpm/proftpd.logrotate 2010-02-09 14:41:59.734217959 +0100
|
|
@@ -1,7 +1,31 @@
|
|
-/var/log/xferlog {
|
|
- missingok
|
|
- notifempty
|
|
- postrotate
|
|
- kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
|
|
- endscript
|
|
-}
|
|
+/var/log/proftpd/xferlog /var/log/proftpd/proftpd.log {
|
|
+ compress
|
|
+ dateext
|
|
+ maxage 365
|
|
+ rotate 99
|
|
+ size=+4096k
|
|
+ notifempty
|
|
+ missingok
|
|
+ create 640 root root
|
|
+ sharedscripts
|
|
+ postrotate
|
|
+ /etc/init.d/proftpd reload
|
|
+ #/etc/init.d/xinetd reload
|
|
+ endscript
|
|
+ }
|
|
+
|
|
+#/var/log/proftpd/access.log /var/log/proftpd/auth.log /var/log/proftpd/paranoid.log {
|
|
+# compress
|
|
+# dateext
|
|
+# maxage 365
|
|
+# rotate 99
|
|
+# size=+4096k
|
|
+# notifempty
|
|
+# missingok
|
|
+# create 640 root root
|
|
+# sharedscripts
|
|
+# postrotate
|
|
+# /etc/init.d/proftpd reload
|
|
+# #/etc/init.d/xinetd reload
|
|
+# endscript
|
|
+#}
|
|
diff -Nur proftpd-1.3.3rc3.orig/contrib/dist/rpm/xinetd proftpd-1.3.3rc3/contrib/dist/rpm/xinetd
|
|
--- proftpd-1.3.3rc3.orig/contrib/dist/rpm/xinetd 2003-08-28 02:33:27.000000000 +0200
|
|
+++ proftpd-1.3.3rc3/contrib/dist/rpm/xinetd 2010-02-09 14:40:29.198747815 +0100
|
|
@@ -2,11 +2,15 @@
|
|
# description: The ProFTPD FTP server
|
|
service ftp
|
|
{
|
|
- flags = REUSE
|
|
socket_type = stream
|
|
+ protocol = tcp
|
|
wait = no
|
|
+# bind = IP
|
|
+ instances = 30
|
|
user = root
|
|
server = /usr/sbin/proftpd
|
|
- log_on_failure += USERID
|
|
- disable = no
|
|
+ log_on_success += PID HOST USERID EXIT DURATION
|
|
+ log_on_failure += HOST USERID ATTEMPT
|
|
+# nice = 10
|
|
+ disable = yes
|
|
}
|
|
I file proftpd-1.3.3rc3.orig/.ltmain.sh.rej.swp e proftpd-1.3.3rc3/.ltmain.sh.rej.swp sono diversi
|