Changeset: 21678fbd729e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21678fbd729e
Modified Files:
sql/configure.ag
sql/src/server/rel_updates.c
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (89 lines):
diff -r faa5da704c88 -r 21678fbd729e sql/configure.ag
--- a/sql/configure.ag Tue Dec 14 13:28:20 2010 +0100
+++ b/sql/configure.ag Tue Dec 14 14:35:48 2010 +0100
@@ -79,8 +79,6 @@
AM_MONETDB_LIBS()
AM_MONETDB_UTILS()
-AC_CHECK_FUNCS([realpath])
-
req_monetdb5_ver='5.22.0'
# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
diff -r faa5da704c88 -r 21678fbd729e sql/src/server/rel_updates.c
--- a/sql/src/server/rel_updates.c Tue Dec 14 13:28:20 2010 +0100
+++ b/sql/src/server/rel_updates.c Tue Dec 14 14:35:48 2010 +0100
@@ -573,22 +573,12 @@
return sql_error(sql, 02, "COPY INTO: copy into table '%s' not
allowed in readonly mode", tname);
if (files) {
dnode *n = files->h;
-#ifdef HAVE_REALPATH
- char realdbfarm[PATH_MAX];
- char realfile[PATH_MAX];
-#endif
if (sql->user_id != USER_MONETDB)
return sql_error(sql, 02, "COPY INTO: insufficient
privileges: "
"COPY INTO from file(s) requires
administrator rights, "
"use 'COPY INTO \"%s\" FROM STDIN'
instead", tname);
-#ifdef HAVE_REALPATH
- if (realpath(GDKgetenv("gdk_dbfarm"), realdbfarm) == NULL) {
- return sql_error(sql, 02, "COPY INTO: failed to get
real path for dbfarm '%s'",
- GDKgetenv("gdk_dbfarm"));
- }
-#endif
for (; n; n = n->next) {
char *fname = n->data.sval;
@@ -597,15 +587,6 @@
if (fname && !MT_path_absolute(fname))
return sql_error(sql, 02, "COPY INTO: filename
must "
"have absolute path: %s",
fname);
-#ifdef HAVE_REALPATH
- if (realpath(fname, realfile) == NULL) {
- return sql_error(sql, 02, "COPY INTO: failed to
get real path for '%s'",
- fname);
- }
- if (strncmp(realdbfarm, realfile, strlen(realdbfarm))
== 0)
- return sql_error(sql, 02, "COPY INTO: file may
not "
- "reside in the server's dbfarm:
%s", realfile);
-#endif
nrel = rel_import(sql, t, tsep, rsep, ssep, ns, fname,
nr, offset, locked);
@@ -720,10 +701,6 @@
static sql_rel *
copyto(mvc *sql, symbol *sq, str filename, dlist *seps, str null_string)
{
-#ifdef HAVE_REALPATH
- char realdbfarm[PATH_MAX];
- char realfile[PATH_MAX];
-#endif
char *tsep = seps->h->data.sval;
char *rsep = seps->h->next->data.sval;
char *ssep = (seps->h->next->next)?seps->h->next->next->data.sval:"\"";
@@ -747,22 +724,9 @@
return sql_error(sql, 02, "COPY INTO: insufficient
privileges: "
"COPY INTO file requires administrator
rights, "
"use 'COPY ... INTO STDOUT' instead");
- if (filename && *filename != '/')
+ if (filename && !MT_path_absolute(filename))
return sql_error(sql, 02, "COPY INTO: filename must "
"have absolute path: %s", filename);
-#ifdef HAVE_REALPATH
- if (realpath(GDKgetenv("gdk_dbfarm"), realdbfarm) == NULL) {
- return sql_error(sql, 02, "COPY INTO: failed to get
real path for dbfarm '%s'",
- GDKgetenv("gdk_dbfarm"));
- }
- if (realpath(filename, realfile) == NULL) {
- return sql_error(sql, 02, "COPY INTO: failed to get
real path for '%s'",
- filename);
- }
- if (strncmp(realdbfarm, realfile, strlen(realdbfarm)) == 0)
- return sql_error(sql, 02, "COPY INTO: file may not "
- "reside in the server's dbfarm: %s",
realfile);
-#endif
if (lstat(filename, &fs) == 0)
return sql_error(sql, 02, "COPY INTO: file already "
"exists: %s", filename);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
