Merge pull request #105 from Bandie/master

Fixing disimprovement of 0.3.2 (#101)

ChangeLog

@@ -1,9 +1,16 @@
-## [0.3.0]
+## [0.3.3]
+- Bugfix for 0.3.2: Fixing disimprovement.
+
+## [0.3.2]
+- Bugfix: Media devices are working again
+
+## [0.3.1]
 - pam_panic_config, a configuration generator
 - Translations for pam_panic_config
 - Timeouts when typing wrong passwords
 - Strict mode: Choose if you want to be locked out if the configuration is corrupt
 - Added translations: nl, pl
+- Build fix coming with this new release
 
 ## [0.2.5]
 - MBR support

configure.ac

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

po/de.po

@@ -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-03 00:25+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:145
+#: 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:184
+#: 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."
 

po/es.po

@@ -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-03 00:25+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:145
+#: 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:184
+#: 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."
 

po/fr.po

@@ -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-03 00:25+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:145
+#: 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:184
+#: 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."
 

po/ja.po

@@ -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-03 00:25+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:145
+#: 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:184
+#: src/pam_panic/pam_panic.c:188
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr "引数 \"serious\"のアラート：デバイスが存在しません。"
 

po/nl.po

@@ -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-03 00:25+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:145
+#: 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:184
+#: src/pam_panic/pam_panic.c:188
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr "WAARSCHUWING bij argument \"serious\": Toestel bestaat niet."
 

po/pam_panic.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pam_panic 0.3.0\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-03 00:25+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:145
+#: 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:184
+#: src/pam_panic/pam_panic.c:188
 msgid "ALERT for argument \"serious\": Device doesn't exist."
 msgstr ""
 

src/pam_panic/pam_panic.c

@@ -52,26 +52,30 @@ void argSplit(char **some_arg, char **some_temp, const char *arg){
   *some_temp = strtok(NULL, "="); 
 }
 
-void constrPath(char **dst, char **src){
+void constrPath(char **dst, char **src, int8_t bGPTOnly){
 
   char tmp[256];
 
-  // EFI
+  // GPT
   strcpy(tmp, "/dev/disk/by-partuuid/");
   strcat(tmp, *src);
-  if(access(tmp, F_OK) != -1)
+  if(access(tmp, F_OK) != -1 || bGPTOnly){
     sprintf(*dst, "/dev/disk/by-partuuid/%s", *src);
- 
+  } 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);
 
-  // Fallback vendor hardware id
+    // MBR
-  else
+    memset(tmp, 0, sizeof tmp);
-    sprintf(*dst, "/dev/disk/by-id/%s", *src);
+    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);
+    }
+
+  }
 
 }
 
@@ -160,8 +164,8 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, cons
 
   // Construct variables from arguments 
   if(allowed_temp != NULL && rejected_temp != NULL){
-    constrPath(&rejected, &rejected_temp);
+    constrPath(&rejected, &rejected_temp, 1);
-    constrPath(&allowed, &allowed_temp);
+    constrPath(&allowed, &allowed_temp, 1);
   }else{
     rejected = NULL;
     allowed = NULL;
@@ -169,7 +173,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags,	int argc, cons
     
 
   if(bSerious)
-    constrPath(&serious_dev, &serious_temp);
+    constrPath(&serious_dev, &serious_temp, 0);
 
 
   // Free not needed vars
@@ -179,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)

src/pam_panic/pam_panic.h

@@ -10,10 +10,11 @@ LICENSE :      GNU-GPLv3
 #include <security/pam_modules.h>
 #include <security/pam_ext.h>
 #include <syslog.h>
+#include <stdlib.h>
 
 
 void argSplit(char **some_arg, char **some_temp, const char *arg);
-void constrPath(char **dst, char **src);
+void constrPath(char **dst, char **src, int8_t bGPTOnly);
 PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char *argv[]);
 
 

src/pam_panic_config/Makefile.am

@@ -2,7 +2,6 @@ SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable
 bin_SCRIPTS = pam_panic_config
 
 %: %.prebuild.sh
-	make clean-local
 	{ sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g'); version=$$(echo $(VERSION)); $(SED) "s/__SECURELIBDIR__/$$sldr/;s/__PAMPANICPW__/$$bdr\/pam_panic_pw/;s/__VERSION__/$$version/" $< > $@ ; }
 	chmod +x $@
 

src/pam_panic_config/icons/scalable/Makefile.am

@@ -1,6 +1,5 @@
 appicondir=$(datadir)/icons/hicolor/scalable/apps
 appicon_DATA=pampanic.svg
-pixmapsdir=$(datadir)/pixmaps
 
-install-exec-hook:
+pixmapdir=$(datadir)/pixmaps
-	test -L $(pixmapsdir)/pampanic.svg && echo "Symlink exists" || { $(MKDIR_P) $(pixmapsdir) ; $(LN_S) $(appicondir)/pampanic.svg $(pixmapsdir)/pampanic.svg ; }
+pixmap_DATA=pampanic.svg