projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[paraslash.git]
/
user_list.c
diff --git
a/user_list.c
b/user_list.c
index 63bfdfc259878402f3f70c2a5c62be5d5fa96ce9..3c0b4f856546a2173c77696f80e0c554a646985c 100644
(file)
--- a/
user_list.c
+++ b/
user_list.c
@@
-6,11
+6,14
@@
/** \file user_list.c User handling for para_server. */
/** \file user_list.c User handling for para_server. */
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/types.h>
#include <dirent.h>
+#include <openssl/rc4.h>
#include "para.h"
#include "error.h"
#include "para.h"
#include "error.h"
+#include "crypt.h"
#include "fd.h"
#include "string.h"
#include "list.h"
#include "fd.h"
#include "string.h"
#include "list.h"
@@
-53,6
+56,11
@@
static void populate_user_list(char *user_list_file)
para_strerror(-ret));
continue;
}
para_strerror(-ret));
continue;
}
+ if (ret < CHALLENGE_SIZE + 2 * CHALLENGE_SIZE + 41) {
+ PARA_WARNING_LOG("rsa key for %s too small\n", n);
+ rsa_free(rsa);
+ continue;
+ }
u = para_malloc(sizeof(*u));
u->name = para_strdup(n);
u->rsa = rsa;
u = para_malloc(sizeof(*u));
u->name = para_strdup(n);
u->rsa = rsa;