Fixed Makefile not working in Debian 11 & Fix pam_sm_setcred issue on Ubuntu 20.04

Makefile

@@ -11,15 +11,19 @@ all: adduser deluser pam_duress
 
 pam_duress: pam_duress.c
  $(CC) $(CFLAGS) pam_duress.c
- $(CC) $(LDFLAGS) -shared pam_duress.o -o pam_duress.so
+ $(CC) -shared pam_duress.o $(LDFLAGS) -o pam_duress.so
 
-adduser: adduser.c
+adduser.o: adduser.c
  $(CC) $(CFLAGS) adduser.c
- $(CC) $(LDFLAGS) adduser.o -o adduser
 
-deluser: deluser.c
+adduser: adduser.o
+ $(CC) adduser.o $(LDFLAGS) -o adduser
+
+deluser.o: deluser.c
  $(CC) $(CFLAGS) deluser.c
- $(CC) $(LDFLAGS) deluser.o -o deluser
+
+deluser: deluser.o
+ $(CC) deluser.o $(LDFLAGS) -o deluser
 
 install: pam_duress adduser deluser
  if [ -e "$(TARGET)/lib/x86_64-linux-gnu/security" ]; then \
@@ -54,4 +58,4 @@ remove:
  rm -vr $(TARGET)/share/duress
 
 clean:
- rm -v pam_duress.o pam_duress.so adduser.o adduser
+ rm -v pam_duress.o pam_duress.so adduser.o adduser deluser.o deluser

README.md

@@ -79,6 +79,11 @@ Dependencies are:
 * OpenSSL runtime for the scripts
 * OpenSSL (>= 1.1) and PAM dev libraries
 
+For Debian/Ubuntu:
+```
+sudo apt install libssl-dev libpam-dev build-essential
+```
+
 As usual (default PREFIX is /usr):
 ```bash
 PREFIX=/usr/local make

deluser.c

@@ -98,7 +98,6 @@ int main(int argc, char* argv[])
 
  if(strcmp(givenhash, hashfromfile) == 0)
  {
- // TODO : supprimer l'entrée
  sprintf(action_path, "%s%s", PATH_PREFIX, givenhash);
  unlink(action_path);
  fclose(hashes);
@@ -119,7 +118,7 @@ int main(int argc, char* argv[])
  printf("Successfuly removed %s\n", username);
  }
  else
- { 
+ {
  unlink(HASHES_PATH2);
  printf("User %s not found\n", username);
  }

pam_duress.c

@@ -171,6 +171,15 @@ readSalt(byte *salt, const char *path)
  fclose(in);
 }
 
+/* `pam_sm_setcred` is used to set credentials from the module. Our module is not able to do it,
+ * as it can't even know which password it's supposed to set. But apparently recent pam versions need
+ * this to be exposed anyway so we just return SUCCESS */
+PAM_EXTERN int
+pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc __unused, const char **argv __unused)
+{
+ return PAM_SUCCESS;
+}
+
 PAM_EXTERN int
 pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv)
 {
@@ -219,7 +228,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char
  appendHashToPath(hashin, path);
  readSalt(salt, path);
 
- snprintf(dpath, sizeof dpath, "/tmp/action.XXXXX.%s", user);
+ snprintf(dpath, sizeof dpath, "/tmp/action.XXXXXX.%s", user);
  ofd = mkstemps(dpath, strlen(user) + 1);
  if (ofd == -1) {
  syslog(LOG_AUTH|LOG_ERR, "mkstemps failed for %s: %m", dpath);