head	1.3;
access;
symbols
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE:1.3.0.20
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_SOLID:1.3.0.18
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.3
	OPENPKG_2_4_SOLID:1.3.0.16
	OPENPKG_2_4_SOLID_BP:1.3
	OPENPKG_2_3_RELEASE:1.3
	OPENPKG_2_3_SOLID:1.3.0.14
	OPENPKG_2_3_SOLID_BP:1.3
	OPENPKG_2_2_RELEASE:1.3
	OPENPKG_2_2_SOLID:1.3.0.12
	OPENPKG_2_2_SOLID_BP:1.3
	OPENPKG_2_1_RELEASE:1.3
	OPENPKG_2_1_SOLID:1.3.0.10
	OPENPKG_2_1_SOLID_BP:1.3
	OPENPKG_2_0_RELEASE:1.3
	OPENPKG_2_0_SOLID:1.3.0.8
	OPENPKG_2_0_SOLID_BP:1.3
	OPENPKG_1_3_RELEASE:1.3
	OPENPKG_1_3_SOLID:1.3.0.6
	OPENPKG_1_3_SOLID_BP:1.3
	OPENPKG_1_2_SOLID:1.3.0.4
	OPENPKG_1_2_SOLID_BP:1.3
	OPENPKG_1_STABLE:1.3.0.2
	OPENPKG_1_STABLE_BP:1.3
	OPENPKG_1_0_SOLID:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2002.05.29.19.56.15;	author rse;	state dead;
branches;
next	1.2;

1.2
date	2001.12.22.13.41.14;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2001.12.20.08.22.31;	author rse;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2001.12.20.08.22.31;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Finally rename all foo-X.Y.patch files to foo.patch in order
to allow us to preserve history in CVS for patch files.
@
text
@Index: modules/mod_ls.c
===================================================================
RCS file: /var/proftpd/proftpd-1.2/modules/mod_ls.c,v
retrieving revision 1.45
diff -u -r1.45 mod_ls.c
--- modules/mod_ls.c	2001/09/26 15:32:47	1.45
+++ modules/mod_ls.c	2001/12/05 18:59:50
@@@@ -1018,7 +1018,10 @@@@
     glob_t g;
     int    a;
     char   pbuffer[MAXPATHLEN + 1] = "";
-      
+     
+    /* make sure the glob_t is initialized */
+    memset(&g, '\0', sizeof(glob_t));
+ 
     if(*arg == '~') {
       struct passwd *pw;
       int i;
@@@@ -1491,6 +1494,10 @@@@
 	if(strpbrk(target,"{[*?") != NULL) {
 		glob_t g;
 		char **path,*p;
+
+                /* make sure the glob_t is initialized */
+                memset(&g, '\0', sizeof(glob_t));
+
 		
 		if(fs_glob(target,GLOB_PERIOD,NULL,&g) != 0) {
 			add_response_err(R_550,"No files found.");
@


1.2
log
@add patch we forgot
@
text
@@


1.1
log
@file proftpd-1.2.4.patch was initially added on branch OPENPKG_1_0_SOLID.
@
text
@d1 30
@


1.1.2.1
log
@MFC: fix file globbing bug (ProFTPD Bug #1426)
@
text
@a0 30
Index: modules/mod_ls.c
===================================================================
RCS file: /var/proftpd/proftpd-1.2/modules/mod_ls.c,v
retrieving revision 1.45
diff -u -r1.45 mod_ls.c
--- modules/mod_ls.c	2001/09/26 15:32:47	1.45
+++ modules/mod_ls.c	2001/12/05 18:59:50
@@@@ -1018,7 +1018,10 @@@@
     glob_t g;
     int    a;
     char   pbuffer[MAXPATHLEN + 1] = "";
-      
+     
+    /* make sure the glob_t is initialized */
+    memset(&g, '\0', sizeof(glob_t));
+ 
     if(*arg == '~') {
       struct passwd *pw;
       int i;
@@@@ -1491,6 +1494,10 @@@@
 	if(strpbrk(target,"{[*?") != NULL) {
 		glob_t g;
 		char **path,*p;
+
+                /* make sure the glob_t is initialized */
+                memset(&g, '\0', sizeof(glob_t));
+
 		
 		if(fs_glob(target,GLOB_PERIOD,NULL,&g) != 0) {
 			add_response_err(R_550,"No files found.");
@