← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

  • Committer: Brian Aker
  • Date: 2008-08-09 21:43:24 UTC
  • mfrom: (279.1.4 codestyle)
  • Revision ID: brian@tangent.org-20080809214324-jy2c15bx49naddsf
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
318
318
    This is done to ensure that only approved libraries from the
319
319
    plugin directory are used (to make this even remotely secure).
320
320
  */
321
 
  if (my_strchr(files_charset_info, dl->str, dl->str + dl->length, FN_LIBCHAR) ||
 
321
  if (strchr(dl->str, FN_LIBCHAR) ||
322
322
      check_string_char_length((LEX_STRING *) dl, "", NAME_CHAR_LEN,
323
323
                               system_charset_info, 1) ||
324
324
      plugin_dir_len + dl->length + 1 >= FN_REFLEN)