diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-04-15 17:39:43 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-04-15 17:39:43 +0000 |
| commit | 794ec18058ead7d28cb2ae0b2b6ab04c9c544c98 (patch) | |
| tree | cb64ef5c680a2359dfb5da291454311ff0edb936 /net-ftp/proftpd/files | |
| parent | Import of SCM Micro scl011-bin driver, ebuild proxy-maintained by Christoph B... (diff) | |
| download | historical-794ec18058ead7d28cb2ae0b2b6ab04c9c544c98.tar.gz historical-794ec18058ead7d28cb2ae0b2b6ab04c9c544c98.tar.bz2 historical-794ec18058ead7d28cb2ae0b2b6ab04c9c544c98.zip | |
Converted proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch from CRLF to LF
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'net-ftp/proftpd/files')
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch b/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch index d2ae25b61656..7393495e617b 100644 --- a/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch +++ b/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch @@ -1,18 +1,18 @@ -Index: contrib/mod_sql.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql.c,v
-retrieving revision 1.210
-diff -u -r1.210 mod_sql.c
---- contrib/mod_sql.c 26 Mar 2011 00:43:27 -0000 1.210
-+++ contrib/mod_sql.c 12 Apr 2011 22:07:41 -0000
-@@ -4045,8 +4045,8 @@
- if (!cmap.groupcustomgroupsetfast) {
- where = sql_prepare_where(0, cmd, 1, cmap.groupwhere, NULL);
-
-- mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 6, MOD_SQL_DEF_CONN_NAME,
-- cmap.grptable, cmap.grpfields, where, NULL), "sql_select");
-+ mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 5, MOD_SQL_DEF_CONN_NAME,
-+ cmap.grptable, cmap.grpfields, where, "1"), "sql_select");
- if (check_response(mr) < 0) {
- return mr;
- }
+Index: contrib/mod_sql.c +=================================================================== +RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql.c,v +retrieving revision 1.210 +diff -u -r1.210 mod_sql.c +--- contrib/mod_sql.c 26 Mar 2011 00:43:27 -0000 1.210 ++++ contrib/mod_sql.c 12 Apr 2011 22:07:41 -0000 +@@ -4045,8 +4045,8 @@ + if (!cmap.groupcustomgroupsetfast) { + where = sql_prepare_where(0, cmd, 1, cmap.groupwhere, NULL); + +- mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 6, MOD_SQL_DEF_CONN_NAME, +- cmap.grptable, cmap.grpfields, where, NULL), "sql_select"); ++ mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 5, MOD_SQL_DEF_CONN_NAME, ++ cmap.grptable, cmap.grpfields, where, "1"), "sql_select"); + if (check_response(mr) < 0) { + return mr; + } |