Merge branch 'master' into next

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index eebdfd7..3c0b4f8 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 

-/** \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;


@@ -85,12 +93,12 @@ err:
 }
 
 /**
 }
 
 /**

- * initialize the list of users allowed to connecto to para_server
+ * Initialize the list of users allowed to connect to to para_server.

  *
  *

- * \param user_list_file the file containing access information
+ * \param user_list_file The file containing access information.

  *
  *

- * If this function is called a second time, the contents of the
- * previous call are discarded.
+ * If this function is called for the second time, the contents of the
+ * previous call are discarded, i.e. the user list is reloaded.

  */
 void init_user_list(char *user_list_file)
 {
  */
 void init_user_list(char *user_list_file)
 {


@@ -111,12 +119,12 @@ void init_user_list(char *user_list_file)
 }
 
 /**
 }
 
 /**

- * lookup user in user_list.
+ * Lookup a user in the user list.

  *
  *

- * \param name of the user
+ * \param name The name of the user.

  *
  *

- * \return a pointer to the corresponding user struct if the user was found,
- *  \p NULL otherwise.
+ * \return A pointer to the corresponding user struct if the user was found, \p
+ * NULL otherwise.

  */
 struct user *lookup_user(const char *name)
 {
  */
 struct user *lookup_user(const char *name)
 {