← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vsftpd/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/07_vsftpd-enable-utf8.patch

  • Committer: Package Import Robot
  • Author(s): Daniel Llewellyn (Bang Communications)
  • Date: 2013-05-08 14:08:53 UTC
  • mfrom: (2.6.1 squeeze)
  • Revision ID: package-import@ubuntu.com-20130508140853-ahhuki963v9fuuns
Tags: 3.0.2-1ubuntu2
https://launchpad.net/bugs/1160372
* debian/patches/13-disable-clone-newpid.patch
  - patch to remove CLONE_NEWPID syscall
    see: https://bugzilla.novell.com/show_bug.cgi?id=786024#c38
    Fixes LP: #1160372

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_vsftpd-enable-utf8.patch
1
 
diff -Naurp vsftpd-2.2.0.orig/features.c vsftpd-2.2.0/features.c
2
 
--- vsftpd-2.2.0.orig/features.c        2008-12-04 01:00:47.000000000 -0500
3
 
+++ vsftpd-2.2.0/features.c     2009-08-11 09:36:10.000000000 -0400
4
 
@@ -21,6 +21,10 @@ handle_feat(struct vsf_session* p_sess)
5
 
     vsf_cmdio_write_raw(p_sess, " AUTH SSL\r\n");
6
 
     vsf_cmdio_write_raw(p_sess, " AUTH TLS\r\n");
7
 
   }
8
 
+  if (tunable_utf8_filesystem) 
9
 
+  {
10
 
+     vsf_cmdio_write_raw(p_sess, " UTF8\r\n");
11
 
+  }
12
 
   if (tunable_port_enable)
13
 
   {
14
 
     vsf_cmdio_write_raw(p_sess, " EPRT\r\n");
15
 
diff -Naurp vsftpd-2.2.0.orig/parseconf.c vsftpd-2.2.0/parseconf.c
16
 
--- vsftpd-2.2.0.orig/parseconf.c       2009-07-18 01:56:02.000000000 -0400
17
 
+++ vsftpd-2.2.0/parseconf.c    2009-08-11 09:36:10.000000000 -0400
18
 
@@ -28,6 +28,7 @@ static struct parseconf_bool_setting
19
 
 parseconf_bool_array[] =
20
 
 {
21
 
   { "anonymous_enable", &tunable_anonymous_enable },
22
 
+  { "utf8_filesystem", &tunable_utf8_filesystem },
23
 
   { "local_enable", &tunable_local_enable },
24
 
   { "pasv_enable", &tunable_pasv_enable },
25
 
   { "port_enable", &tunable_port_enable },
26
 
diff -Naurp vsftpd-2.2.0.orig/tunables.c vsftpd-2.2.0/tunables.c
27
 
--- vsftpd-2.2.0.orig/tunables.c        2009-07-15 16:08:27.000000000 -0400
28
 
+++ vsftpd-2.2.0/tunables.c     2009-08-11 09:36:10.000000000 -0400
29
 
@@ -10,6 +10,7 @@
30
 
 
31
 
 int tunable_anonymous_enable;
32
 
 int tunable_local_enable;
33
 
+int tunable_utf8_filesystem;
34
 
 int tunable_pasv_enable;
35
 
 int tunable_port_enable;
36
 
 int tunable_chroot_local_user;
37
 
@@ -146,6 +147,7 @@ tunables_load_defaults()
38
 
 {
39
 
   tunable_anonymous_enable = 1;
40
 
   tunable_local_enable = 0;
41
 
+  tunable_utf8_filesystem = 0;
42
 
   tunable_pasv_enable = 1;
43
 
   tunable_port_enable = 1;
44
 
   tunable_chroot_local_user = 0;
45
 
diff -Naurp vsftpd-2.2.0.orig/tunables.h vsftpd-2.2.0/tunables.h
46
 
--- vsftpd-2.2.0.orig/tunables.h        2009-07-06 21:37:28.000000000 -0400
47
 
+++ vsftpd-2.2.0/tunables.h     2009-08-11 09:36:10.000000000 -0400
48
 
@@ -11,6 +11,7 @@ void tunables_load_defaults();
49
 
 /* Booleans */
50
 
 extern int tunable_anonymous_enable;          /* Allow anon logins */
51
 
 extern int tunable_local_enable;              /* Allow local logins */
52
 
+extern int tunable_utf8_filesystem;           /* Server uses UTF8 Filesystem */
53
 
 extern int tunable_pasv_enable;               /* Allow PASV */
54
 
 extern int tunable_port_enable;               /* Allow PORT */
55
 
 extern int tunable_chroot_local_user;         /* Restrict local to home dir */