Bandie/pam_panic
Bandie
/
pam_panic
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Fixing disimprovement of 0.3.2 (#101)

This commit is contained in:
Bandie 2018-12-23 16:46:26 +01:00
parent 00372dcf44
commit 515791b042
Signed by: Bandie
GPG Key ID: C1E133BC65A822DD
9 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
## [0.3.3]
- Bugfix for 0.3.2: Fixing disimprovement.
## [0.3.2]
- Bugfix: Media devices are working again

2
configure.ac
View File

@ -1,6 +1,6 @@
AC_INIT(
[pam_panic],
[0.3.2],
[0.3.3],
[https://github.com/pampanic/pam_panic/issues],
[pam_panic])
AC_CONFIG_AUX_DIR([build-aux])

6
po/de.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_panic 0.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
"POT-Creation-Date: 2018-12-23 15:26+0100\n"
"POT-Creation-Date: 2018-12-23 16:43+0100\n"
"PO-Revision-Date: 2018-11-14 17:26+0100\n"
"Last-Translator: Bandie <bandie@chaospott.de>\n"
"Language-Team: German\n"
@ -23,7 +23,7 @@ msgstr ""
msgid "CRITICAL: Problem with regcomp."
msgstr "CRITICAL: Problem mit regcomp."
#: src/pam_panic/pam_panic.c:147
#: src/pam_panic/pam_panic.c:149
msgid ""
"ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
"valid GPT UUID."
@ -31,7 +31,7 @@ msgstr ""
"ERROR: Argument ungültig. Hinweis: \"allow\" und \"reject\" müssen eine "
"valide GPT UUID aufweisen."
#: src/pam_panic/pam_panic.c:186
#: src/pam_panic/pam_panic.c:188
msgid "ALERT for argument \"serious\": Device doesn't exist."
msgstr "ALERT für Argument \"serious\": Gerät existiert nicht."

6
po/es.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_panic 0.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
"POT-Creation-Date: 2018-12-23 15:26+0100\n"
"POT-Creation-Date: 2018-12-23 16:43+0100\n"
"PO-Revision-Date: 2018-11-14 17:26+0100\n"
"Last-Translator: Dangered wolf <d@ngeredwolf.me>\n"
"Language-Team: Spanish\n"
@ -23,7 +23,7 @@ msgstr ""
msgid "CRITICAL: Problem with regcomp."
msgstr "CRITICAL: Problema con regcomp."
#: src/pam_panic/pam_panic.c:147
#: src/pam_panic/pam_panic.c:149
msgid ""
"ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
"valid GPT UUID."
@ -31,7 +31,7 @@ msgstr ""
"ERROR: Argumentos inválidos. Tenga en cuenta que \"allow\" y \"reject\" "
"deben tener un UUID de GPT válido."
#: src/pam_panic/pam_panic.c:186
#: src/pam_panic/pam_panic.c:188
msgid "ALERT for argument \"serious\": Device doesn't exist."
msgstr "ALERT para el argumento \"serious\": El dispositivo no existe."

6
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_panic 0.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
"POT-Creation-Date: 2018-12-23 15:26+0100\n"
"POT-Creation-Date: 2018-12-23 16:43+0100\n"
"PO-Revision-Date: 2018-11-14 17:26+0100\n"
"Last-Translator: Dashie <dashie@otter.sh>\n"
"Language-Team: French\n"
@ -22,7 +22,7 @@ msgstr ""
msgid "CRITICAL: Problem with regcomp."
msgstr "CRITIQUE: Problème avec regcomp."
#: src/pam_panic/pam_panic.c:147
#: src/pam_panic/pam_panic.c:149
msgid ""
"ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
"valid GPT UUID."
@ -30,7 +30,7 @@ msgstr ""
"ERREUR: Arguments invalides. Notez que \"allow\" et \"reject\" doivent avoir "
"un UUID GPT valide."
#: src/pam_panic/pam_panic.c:186
#: src/pam_panic/pam_panic.c:188
msgid "ALERT for argument \"serious\": Device doesn't exist."
msgstr "ALERTE pour l'argument \"serious\" : Le périphérique n'existe pas."

6
po/ja.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_panic 0.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
"POT-Creation-Date: 2018-12-23 15:26+0100\n"
"POT-Creation-Date: 2018-12-23 16:43+0100\n"
"PO-Revision-Date: 2018-11-29 19:47+0100\n"
"Last-Translator: Chromium Neptune <chromium@neplanet.com>\n"
"Language-Team: Japanese\n"
@ -22,7 +22,7 @@ msgstr ""
msgid "CRITICAL: Problem with regcomp."
msgstr "クリティカル： \"regcomp\"の問題"
#: src/pam_panic/pam_panic.c:147
#: src/pam_panic/pam_panic.c:149
msgid ""
"ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
"valid GPT UUID."
@ -30,7 +30,7 @@ msgstr ""
"エラー： 引き数が無効です。 \"allow\"と \"reject\"には有効なGPT UUIDが必要で"
"す。"
#: src/pam_panic/pam_panic.c:186
#: src/pam_panic/pam_panic.c:188
msgid "ALERT for argument \"serious\": Device doesn't exist."
msgstr "引数 \"serious\"のアラート：デバイスが存在しません。"

6
po/nl.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_panic 0.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
"POT-Creation-Date: 2018-12-23 15:26+0100\n"
"POT-Creation-Date: 2018-12-23 16:43+0100\n"
"PO-Revision-Date: 2018-11-23 23:50+0100\n"
"Last-Translator: chris <chris@heychris.eu>\n"
"Language-Team: \n"
@ -22,7 +22,7 @@ msgstr ""
msgid "CRITICAL: Problem with regcomp."
msgstr "KRITISCH: Probleem met regcomp."
#: src/pam_panic/pam_panic.c:147
#: src/pam_panic/pam_panic.c:149
msgid ""
"ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
"valid GPT UUID."
@ -30,7 +30,7 @@ msgstr ""
"FOUT: Argumenten niet geldig. Let erop dat \"allow\" en \"reject\" een "
"geldige GPT UUID nodig hebben."
#: src/pam_panic/pam_panic.c:186
#: src/pam_panic/pam_panic.c:188
msgid "ALERT for argument \"serious\": Device doesn't exist."
msgstr "WAARSCHUWING bij argument \"serious\": Toestel bestaat niet."

8
po/pam_panic.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: pam_panic 0.3.1\n"
"Project-Id-Version: pam_panic 0.3.3\n"
"Report-Msgid-Bugs-To: https://github.com/pampanic/pam_panic\n"
"POT-Creation-Date: 2018-12-23 15:26+0100\n"
"POT-Creation-Date: 2018-12-23 16:43+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -21,13 +21,13 @@ msgstr ""
msgid "CRITICAL: Problem with regcomp."
msgstr ""
#: src/pam_panic/pam_panic.c:147
#: src/pam_panic/pam_panic.c:149
msgid ""
"ERROR: Arguments invalid. Note that \"allow\" and \"reject\" must have a "
"valid GPT UUID."
msgstr ""
#: src/pam_panic/pam_panic.c:186
#: src/pam_panic/pam_panic.c:188
msgid "ALERT for argument \"serious\": Device doesn't exist."
msgstr ""

28
src/pam_panic/pam_panic.c
View File

@ -59,21 +59,23 @@ void constrPath(char **dst, char **src, int8_t bGPTOnly){
// GPT
strcpy(tmp, "/dev/disk/by-partuuid/");
strcat(tmp, *src);
if(access(tmp, F_OK) != -1 || bGPTOnly)
if(access(tmp, F_OK) != -1 || bGPTOnly){
sprintf(*dst, "/dev/disk/by-partuuid/%s", *src);
return;
} else{
// MBR
memset(tmp, 0, sizeof tmp);
strcat(tmp, "/dev/disk/by-uuid/");
strcat(tmp, *src);
if(access(tmp, F_OK) != -1)
sprintf(*dst, "/dev/disk/by-uuid/%s", *src);
return;
// MBR
memset(tmp, 0, sizeof tmp);
strcat(tmp, "/dev/disk/by-uuid/");
strcat(tmp, *src);
if(access(tmp, F_OK) != -1){
sprintf(*dst, "/dev/disk/by-uuid/%s", *src);
} else {
// Fallback vendor hardware id
sprintf(*dst, "/dev/disk/by-id/%s", *src);
return;
// Fallback vendor hardware id
sprintf(*dst, "/dev/disk/by-id/%s", *src);
}
}
}
@ -181,7 +183,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons
// Check if panic key exist
// Check if device to be destroyed exist
if(bSerious && access(serious_dev, F_OK) == -1){
pam_syslog(pamh, LOG_ALERT, _("ALERT for argument \"serious\": Device doesn't exist."));
if(bStrict)