diff options
Diffstat (limited to 'server-tools/instance-manager/user_map.cc')
| -rw-r--r-- | server-tools/instance-manager/user_map.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/server-tools/instance-manager/user_map.cc b/server-tools/instance-manager/user_map.cc index 7cb2cd67d7f..1498f2fa947 100644 --- a/server-tools/instance-manager/user_map.cc +++ b/server-tools/instance-manager/user_map.cc @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef __GNUC__ -#pragma interface +#pragma interface #endif #include "user_map.h" @@ -25,6 +25,12 @@ #include "log.h" +#ifdef __WIN__ +#define NEWLINE_LEN 2 +#else +#define NEWLINE_LEN 1 +#endif + struct User { char user[USERNAME_LENGTH + 1]; @@ -59,7 +65,7 @@ int User::init(const char *line) goto err; /* assume that newline characater is present */ - if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + 1) + if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + NEWLINE_LEN) goto err; memcpy(user, name_begin, user_length); @@ -95,7 +101,7 @@ C_MODE_END int User_map::init() { - enum { START_HASH_SIZE = 16 }; + enum { START_HASH_SIZE= 16 }; if (hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0, get_user_key, delete_user, 0)) return 1; |