diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-10-22 23:03:24 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-10-23 00:42:30 +0300 |
commit | 21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee (patch) | |
tree | c3204285a3ba57d590d815c682f1113b6f48d834 /src/pies.h | |
parent | eb8797c9a28f3f4e238bad89b56d331492df7828 (diff) | |
download | pies-21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee.tar.gz pies-21ffba77b92f79a59c62728ede4ad7a4ecb5a0ee.tar.bz2 |
Switch to the latest Grecs.
* Makefile.am (ChangeLog): Use git2chg.awk to build it.
* NEWS: Update.
* bootstrap.conf (gnulib_modules): Grecs does not depend on gnulib any more.
* configure.ac: Version 1.2.90.
Define GRECS_HOST_PROJECT_INCLUDES, remove grecs Makefiles from
AC_CONFIG_FILES: it is now done by GRECS_SETUP itself.
* gnulib.modules (gitlog-to-changelog,argp): Remove.
(configmake): New module.
* grecs: Update to a52ab6c6.
* lib/libpies.h: Remove redefinitions of _() and N_().
* src/Makefile.am: Update for the recent grecs.
* src/acl.c: Rewrite using Grecs support for lists and symtabs.
* src/acl.h: Likewise.
* src/diag.c: Likewise.
* src/inetd.c: Likewise.
* src/meta1gram.y: Likewise.
* src/meta1lex.h: Likewise.
* src/meta1lex.l: Likewise.
* src/pies.c: Likewise.
* src/pies.h: Likewise.
* src/progman.c: Likewise.
* src/userprivs.c: Likewise.
Diffstat (limited to 'src/pies.h')
-rw-r--r-- | src/pies.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,8 +1,8 @@ /* This file is part of GNU Pies. - Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff + Copyright (C) 2008, 2009, 2010, 2011 Sergey Poznyakoff GNU Pies 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 3, or (at your option) any later version. @@ -39,13 +39,13 @@ #include <string.h> #include <pwd.h> #include <grp.h> #include <signal.h> #include <time.h> #include <sysexits.h> -#include <argp.h> +#include <ctype.h> #include <grecs.h> #include <wordsplit.h> #include "progname.h" #include "inttostr.h" @@ -114,13 +114,13 @@ struct action /* user privs */ struct pies_privs { char *user; int allgroups; - gl_list_t groups; + struct grecs_list *groups; }; enum pies_comp_mode { /* Execute the component, no sockets are opened. This is the default Pies mode. */ @@ -163,14 +163,14 @@ struct component char *tag; /* Entry tag (for diagnostics purposes) */ char *program; /* Program name */ size_t argc; /* Number of command line arguments */ char **argv; /* Program command line */ char **env; /* Program environment */ char *dir; /* Working directory */ - gl_list_t prereq; /* Prerequisites */ - gl_list_t depend; /* Dependency targets */ + struct grecs_list *prereq; /* Prerequisites */ + struct grecs_list *depend; /* Dependency targets */ int flags; /* CF_ bitmask */ size_t max_instances; /* Maximum number of simultaneously running instances */ char *rmfile; /* Try to remove this file before starting */ struct pies_privs privs; /* UID/GIDS+groups to run under */ mode_t umask; /* Umask to install before starting */ @@ -372,13 +372,13 @@ void sockaddr_to_str (const struct sockaddr *sa, int salen, char *bufptr, size_t buflen, size_t *plen); char *sockaddr_to_astr (const struct sockaddr *sa, int salen); /* userprivs.c */ -int switch_to_privs (uid_t uid, gid_t gid, gl_list_t retain_groups); +int switch_to_privs (uid_t uid, gid_t gid, struct grecs_list *retain_groups); void pies_priv_setup (struct pies_privs *); void pies_epriv_setup (struct pies_privs *); /* inetd.c */ int inetd_parse_conf (const char *file); |