Update of /cvsroot/monetdb/sql/src/backends/monet5/merovingian
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1897

Modified Files:
        monetdb_set.c 
Log Message:
manually propagated this commit:

date: 2009/09/04 12:12:54;  author: mr-meltdown;  state: Exp;  lines: +11 -0
check argument of forward property, so we can't insert bogus here



U monetdb_set.c
Index: monetdb_set.c
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/merovingian/monetdb_set.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monetdb_set.c       4 Sep 2009 12:37:16 -0000       1.2
+++ monetdb_set.c       4 Sep 2009 12:38:46 -0000       1.3
@@ -212,6 +212,17 @@
                                continue;
                        }
 
+                       if (strcmp(kv->key, "forward") == 0 && kv->val != NULL) 
{
+                               if (strcmp(kv->val, "proxy") != 0 &&
+                                               strcmp(kv->val, "redirect") != 
0)
+                               {
+                                       fprintf(stderr, "%s: expected 'proxy' 
or 'redirect' for "
+                                                       "property 'forward', 
got: %s\n", argv[0], kv->val);
+                                       state |= 1;
+                                       continue;
+                               }
+                       }
+
                        writeProps(props, stats->path);
                        freeConfFile(props);
                }


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to