dccp_send.c: Minor cleanups.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index 3d57a9454e87e745e29811a99dc19d2dbf534eb5..be369817bf0c47dc6f4d38bd88165fc6fdef8196 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *

- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * 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 */


@@ -72,10 +60,10 @@ static void populate_user_list(char *user_list_file)
                                u->perms |= VSS_READ;
                        else if (!strcmp(tmp[num], "VSS_WRITE"))
                                u->perms |= VSS_WRITE;
                                u->perms |= VSS_READ;
                        else if (!strcmp(tmp[num], "VSS_WRITE"))
                                u->perms |= VSS_WRITE;

-                       else if (!strcmp(tmp[num], "DB_READ"))
-                               u->perms |= DB_READ;
-                       else if (!strcmp(tmp[num], "DB_WRITE"))
-                               u->perms |= DB_WRITE;
+                       else if (!strcmp(tmp[num], "AFS_READ"))
+                               u->perms |= AFS_READ;
+                       else if (!strcmp(tmp[num], "AFS_WRITE"))
+                               u->perms |= AFS_WRITE;

                        else /* unknown permission */
                                PARA_WARNING_LOG("ignoring unknown permission: %s\n",
                                        tmp[num]);
                        else /* unknown permission */
                                PARA_WARNING_LOG("ignoring unknown permission: %s\n",
                                        tmp[num]);


@@ -108,7 +96,7 @@ void init_user_list(char *user_list_file)
                list_for_each_entry_safe(u, tmp, &user_list, node) {
                        list_del(&u->node);
                        free(u->name);
                list_for_each_entry_safe(u, tmp, &user_list, node) {
                        list_del(&u->node);
                        free(u->name);

-                       free(u->rsa);
+                       rsa_free(u->rsa);

                        free(u);
                }
        } else
                        free(u);
                }
        } else