diff options
| -rw-r--r-- | src/common.c | 44 | ||||
| -rw-r--r-- | src/common.h | 8 | ||||
| -rw-r--r-- | src/log-login-btmp.c | 34 | ||||
| -rw-r--r-- | src/log-login-utmp.c | 41 |
4 files changed, 64 insertions, 63 deletions
diff --git a/src/common.c b/src/common.c new file mode 100644 index 0000000..a8dc151 --- /dev/null +++ b/src/common.c @@ -0,0 +1,44 @@ +/** + * cerberus-logging – Log-in logging extension for cerberus + * + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.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 3 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, see <http://www.gnu.org/licenses/>. + */ +#include "common.h" + + +#define X(A) const char* A = NULL; + LIST_ARGUMENTS +#undef X + + +int main(int argc, char** argv) +{ + int i; + + for (i = 1; i < argc; i++) + { +#define X(A) if (strstr(argv[i], "--" #A "=")) A = strchr(argv[i], '=') + 1; + LIST_ARGUMENTS +#undef X + } + + if (NULL == username) return 1; + if (NULL == ttyname) return 1; + if (NULL == pid) return 1; + + return -do_log(); +} + diff --git a/src/common.h b/src/common.h index 0a1b37f..0acee7f 100644 --- a/src/common.h +++ b/src/common.h @@ -42,6 +42,11 @@ +#define X(A) extern const char* A; + LIST_ARGUMENTS +#undef X + + static inline const char* first_digit(const char* str) { for (; str && *str; str++) @@ -82,3 +87,6 @@ static inline const char* get_hostaddress(const char* hostname) return rc; } + +int do_log(void); + diff --git a/src/log-login-btmp.c b/src/log-login-btmp.c index 35b2b31..6d4ae18 100644 --- a/src/log-login-btmp.c +++ b/src/log-login-btmp.c @@ -17,42 +17,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "common.h" - #include <utmp.h> - -#define X(A) static const char* A = NULL; - LIST_ARGUMENTS -#undef X - - -static int log_action(void); - - -int main(int argc, char** argv) +int do_log(void) { - int i; - - for (i = 1; i < argc; i++) - { -#define X(A) if (strstr(argv[i], "--" #A "=")) A = strchr(argv[i], '=') + 1; - LIST_ARGUMENTS -#undef X - } + struct utmp ut; - if (!streq(action, "failed")) return 0; - if (NULL == username) return 1; - if (NULL == ttyname) return 1; - if (NULL == pid) return 1; + if (!streq(action, "failed")) + return 0; - return -log_action(); -} - - -static int log_action(void) -{ - struct utmp ut; memset(&ut, 0, sizeof(struct utmp)); ut.ut_type = LOGIN_PROCESS; diff --git a/src/log-login-utmp.c b/src/log-login-utmp.c index c696243..081c63e 100644 --- a/src/log-login-utmp.c +++ b/src/log-login-utmp.c @@ -17,46 +17,21 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "common.h" - #include <utmp.h> - -#define X(A) static const char* A = NULL; - LIST_ARGUMENTS -#undef X - - -static int log_action(void); - - -int main(int argc, char** argv) -{ - int i; - - for (i = 1; i < argc; i++) - { -#define X(A) if (strstr(argv[i], "--" #A "=")) A = strchr(argv[i], '=') + 1; - LIST_ARGUMENTS -#undef X - } - - if (!streq(action, "login")) return 0; - if (NULL == username) return 1; - if (NULL == ttyname) return 1; - if (NULL == pid) return 1; - - return -log_action(); -} - - -static int log_action(void) +int do_log(void) { struct utmp ut; struct utmp *entry; - pid_t pid_ = (pid_t)atoll(pid); - const char* ttyno = first_digit(ttyname); + pid_t pid_; + const char* ttyno; + if (!streq(action, "login")) + return 0; + + pid_ = (pid_t)atoll(pid); + ttyno = first_digit(ttyname); memset(&ut, 0, sizeof(struct utmp)); utmpname(_PATH_UTMP); |