diff options
| -rw-r--r-- | src/ladmin/ladmin.c | 4 | ||||
| -rw-r--r-- | src/tool/adduser.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c index 8a3877dc4..27a95e171 100644 --- a/src/ladmin/ladmin.c +++ b/src/ladmin/ladmin.c @@ -3295,9 +3295,7 @@ int parse_fromlogin(int fd) { if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
return 0;
{
- char md5str[64] = "", md5bin[32], md5key[RFIFOW(fd,2) - 4 + 1];
- memcpy(md5key, RFIFOP(fd,4), RFIFOW(fd,2) - 4);
- md5key[sizeof(md5key)-1] = '0';
+ char md5str[64] = "", md5bin[32];
if (passenc == 1) {
strncpy(md5str, (const char*)RFIFOP(fd,4), RFIFOW(fd,2) - 4);
strcat(md5str, loginserveradminpassword);
diff --git a/src/tool/adduser.c b/src/tool/adduser.c index 2c8e1524b..800154997 100644 --- a/src/tool/adduser.c +++ b/src/tool/adduser.c @@ -37,10 +37,11 @@ int main(int argc, char *argv[]) { int next_id, id;
char line[1024];
+ FILE *FPaccin,*FPaccout;
// Check to see if account.txt exists.
printf("Checking if '%s' file exists...\n", account_txt);
- FILE *FPaccin = fopen(account_txt, "r");
+ FPaccin = fopen(account_txt, "r");
if (FPaccin == NULL) {
printf("'%s' file not found!\n", account_txt);
printf("Run the setup wizard please.\n");
@@ -90,7 +91,7 @@ int main(int argc, char *argv[]) { scanf("%s", &sex);
}
- FILE *FPaccout = fopen(account_txt, "r+");
+ FPaccout = fopen(account_txt, "r+");
fseek(FPaccout, 0, SEEK_END);
fprintf(FPaccout, "%i %s %s - %s -\r\n", next_id, username, password, sex);
close(FPaccout);
|