[prev in list] [next in list] [prev in thread] [next in thread] 

List:       proftpd-committers
Subject:    [ProFTPD-committers] CVS: proftpd/src auth.c,1.83,1.84
From:       "TJ Saunders" <castaglia () users ! sourceforge ! net>
Date:       2010-08-30 17:37:05
Message-ID: E1Oq8I5-0001yR-Tk () sfp-cvsdas-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/proftp/proftpd/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7560/src

Modified Files:
	auth.c 
Log Message:

Bug#3501 - <Anonymous> logins with "AuthAliasOnly on" still handled as
anonymous logins.


Index: auth.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/auth.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- auth.c	30 Jun 2010 15:57:25 -0000	1.83
+++ auth.c	30 Aug 2010 17:37:03 -0000	1.84
@@ -1225,14 +1225,18 @@
   }
 
   if (!is_alias) {
-    auth_alias_only = get_param_ptr(anon_c ? anon_c->subset : main_server->conf,
+    /* Yes, we do want to be using c, not anon_c, here.  Otherwise, we
+     * risk a regression of Bug#3501.
+     */
+
+    auth_alias_only = get_param_ptr(c ? c->subset : main_server->conf,
       "AuthAliasOnly", FALSE);
 
     if (auth_alias_only &&
         *auth_alias_only == TRUE) {
-      if (anon_c &&
-          anon_c->config_type == CONF_ANON) {
-        anon_c = NULL;
+      if (c &&
+          c->config_type == CONF_ANON) {
+        c = NULL;
 
       } else {
         *login_name = NULL;
@@ -1245,7 +1249,7 @@
           *auth_alias_only == TRUE)
         *login_name = NULL;
 
-      if ((!login_name || !anon_c) &&
+      if ((!login_name || !c) &&
           anon_name) {
         *anon_name = NULL;
       }


------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
ProFTPD Committers Mailing List
proftpd-committers@proftpd.org
https://lists.sourceforge.net/lists/listinfo/proftp-committers
[prev in list] [next in list] [prev in thread] [next in thread]