- updated to 1.4.0

[packages/pam.git] / pam-mkhomedir-notfound.patch

diff -urN Linux-PAM-0.99.7.1.orig/modules/pam_mkhomedir/pam_mkhomedir.8.xml Linux-PAM-0.99.7.1/modules/pam_mkhomedir/pam_mkhomedir.8.xml
--- Linux-PAM-0.99.7.1.orig/modules/pam_mkhomedir/pam_mkhomedir.8.xml	2006-05-30 15:03:09.000000000 +0200
+++ Linux-PAM-0.99.7.1/modules/pam_mkhomedir/pam_mkhomedir.8.xml	2007-02-03 22:09:37.942620000 +0100
@@ -29,6 +29,9 @@
         umask=<replaceable>mode</replaceable>
       </arg>
       <arg choice="opt">
+        notfound=[<replaceable>create</replaceable>|<replaceable>deny</replaceable>|<replaceable>ignore</replaceable>]
+      </arg>
+      <arg choice="opt">
         skel=<replaceable>skeldir</replaceable>
       </arg>
     </cmdsynopsis>
@@ -82,6 +94,20 @@
 
       <varlistentry>
         <term>
+          <option>notfound=[<replaceable>create</replaceable>|<replaceable>deny</replaceable>|<replaceable>ignore</replaceable>]</option>
+        </term>
+        <listitem>
+          <para>
+            What to do if home directory is not found or it is not a directory.
+	    <replaceable>create</replaceable> - default, make home directory;
+	    <replaceable>deny</replaceable> - deny access;
+	    <replaceable>ignore</replaceable> - do nothing
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
           <option>skel=<replaceable>/path/to/skel/directory</replaceable></option>
         </term>
         <listitem>
--- Linux-PAM-1.4.0/modules/pam_mkhomedir/pam_mkhomedir.c.orig	2020-06-08 12:17:27.000000000 +0200
+++ Linux-PAM-1.4.0/modules/pam_mkhomedir/pam_mkhomedir.c	2020-08-25 19:45:06.233402760 +0200
@@ -53,8 +53,11 @@
 #include "pam_inline.h"
 
 /* argument parsing */
-#define MKHOMEDIR_DEBUG      020	/* be verbose about things */
-#define MKHOMEDIR_QUIET      040	/* keep quiet about things */
+#define MKHOMEDIR_DEBUG      0x10	/* be verbose about things */
+#define MKHOMEDIR_QUIET      0x20	/* keep quiet about things */
+/* what to do, if home directory does not exist? */
+#define HOMEDIR_CREATE       0x40	/* create it */
+#define HOMEDIR_DENY         0x80	/* deny access */
 
 struct options_t {
   int ctrl;
@@ -67,7 +70,7 @@
 _pam_parse (const pam_handle_t *pamh, int flags, int argc, const char **argv,
 	    options_t *opt)
 {
-   opt->ctrl = 0;
+   opt->ctrl = HOMEDIR_CREATE;
    opt->umask = "0022";
    opt->skeldir = "/etc/skel";
 
@@ -88,6 +91,15 @@
 	 opt->umask = str;
       } else if ((str = pam_str_skip_prefix(*argv, "skel=")) != NULL) {
 	 opt->skeldir = str;
+      } else if ((str = pam_str_skip_prefix(*argv, "notfound=")) != NULL) {
+	 if (!strcmp(str, "create"))
+	    opt->ctrl = (opt->ctrl | HOMEDIR_CREATE) & ~HOMEDIR_DENY;
+	 else if (!strcmp(str, "deny"))
+	    opt->ctrl = (opt->ctrl | HOMEDIR_DENY) & ~HOMEDIR_CREATE;
+	 else if (!strcmp(str, "ignore"))
+	    opt->ctrl &= ~(HOMEDIR_CREATE | HOMEDIR_DENY);
+	 else
+	    pam_syslog(pamh, LOG_ERR, "unknown parameter for \"create\" option: %s", str);
       } else {
 	 pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
       }
@@ -221,7 +233,12 @@
       return PAM_SUCCESS;
    }
 
-   return create_homedir(pamh, &opt, user, pwd->pw_dir);
+   if (opt.ctrl & HOMEDIR_CREATE)
+      return create_homedir(pamh, &opt, user, pwd->pw_dir);
+   else if (opt.ctrl & HOMEDIR_DENY)
+      return PAM_PERM_DENIED;
+   else
+      return PAM_SUCCESS;
 }
 
 /* Ignore */