Просмотр исходного кода

do not use PAM-related configs in non-PAM world

Ralf S. Engelschall 23 лет назад
Родитель
Сommit
b5fb3945e6
2 измененных файлов с 11 добавлено и 6 удалено
  1. 5 5
      proftpd/proftpd.conf
  2. 6 1
      proftpd/proftpd.spec

+ 5 - 5
proftpd/proftpd.conf

@@ -8,11 +8,6 @@ DefaultServer         off
 SocketBindTight       on
 Port                  none
 
-AuthPAM               on
-AuthPAMConfig         proftpd
-AuthPAMAuthoritative  off
-#PersistentPassword   off
-
 MaxInstances          40
 User                  @l_nusr@
 Group                 @l_ngrp@
@@ -26,6 +21,11 @@ MaxLoginAttempts      2
 RequireValidShell     yes
 LsDefaultOptions      "-l"
 
+@l_pam@AuthPAM               on
+@l_pam@AuthPAMConfig         proftpd
+@l_pam@AuthPAMAuthoritative  off
+#PersistentPassword   off
+
 TimeoutLogin          120
 TimeoutNoTransfer     600
 TimeoutStalled        600

+ 6 - 1
proftpd/proftpd.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        FTP
 License:      GPL
 Version:      1.2.6
-Release:      20020916
+Release:      20021008
 
 #   list of sources
 Source0:      ftp://ftp.proftpd.net/distrib/source/proftpd-%{version}.tar.bz2
@@ -136,10 +136,15 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/proftpd/cfg.html
 
     #   extended installation with own stuff
+    l_pam="#"
+%if "%{with_pam}" == "yes"
+    l_pam=""
+%endif
     %{l_shtool} install -c -m 644 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_nusr@;%{l_nusr};g' \
         -e 's;@l_ngrp@;%{l_ngrp};g' \
+        -e "s;@l_pam@;${l_pam};g" \
         %{SOURCE proftpd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/proftpd/
     %{l_shtool} install -c -m 644 \
         %{SOURCE proftpd.msg.goaway} \