svn rev #3318: branches/krb5-appl-1-0/gssftp/ftpd/

[ghudson@MIT.EDU]

Commit By: ghudson
Log Message:
Pull up r3309 from trunk.

 ------------------------------------------------------------------------
 r3309 | ghudson | 2011-04-26 14:42:00 -0400 (Tue, 26 Apr 2011) | 5 lines

 ticket: 6889

 Correctly parse "restrict" lines in ftpusers.  From Jatin Nansi via
 nalin at redhat.com.



Changed Files:
U   branches/krb5-appl-1-0/gssftp/ftpd/ftpd.c
Modified: branches/krb5-appl-1-0/gssftp/ftpd/ftpd.c
===================================================================
--- branches/krb5-appl-1-0/gssftp/ftpd/ftpd.c	2011-07-11 19:31:31 UTC (rev 3317)
+++ branches/krb5-appl-1-0/gssftp/ftpd/ftpd.c	2011-07-11 19:32:30 UTC (rev 3318)
@@ -805,7 +805,7 @@
 			if (strcmp(line, name) == 0)
 			     return (1);
 			if (strncmp(line, name, strlen(name)) == 0) {
-			     int i = strlen(name) + 1;
+			     int i = strlen(name);
 			     
 			     /* Make sure foo doesn't match foobar */
 			     if (line[i] == '\0' || !isspace((int) line[i]))