← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.cc

  • Committer: Mark Atwood
  • Date: 2011-06-03 17:50:56 UTC
  • mfrom: (2313.3.5 void)
  • Revision ID: me@mark.atwood.name-20110603175056-i7ayql2uc1sdrohc
merge lp:~olafvdspek/drizzle/void

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.cc
58
58
{
59
59
}
60
60
 
61
 
in_port_t ListenDrizzleProtocol::getPort(void) const
 
61
in_port_t ListenDrizzleProtocol::getPort() const
62
62
{
63
63
  return port;
64
64
}
73
73
  }
74
74
}
75
75
 
76
 
bool ClientDrizzleProtocol::isAdminAllowed(void)
 
76
bool ClientDrizzleProtocol::isAdminAllowed()
77
77
{
78
 
  if (std::find(drizzle_admin_ip_addresses.begin(), drizzle_admin_ip_addresses.end(), session->user()->address()) != drizzle_admin_ip_addresses.end())
79
 
    return true;
80
 
 
81
 
  return false;
 
78
  return std::find(drizzle_admin_ip_addresses.begin(), drizzle_admin_ip_addresses.end(), session->user()->address()) != drizzle_admin_ip_addresses.end();
82
79
}
83
80
 
84
81
plugin::Client *ListenDrizzleProtocol::getClient(int fd)