From: Tomas Mraz <tm@t8m.info>
Date: Thu, 18 Nov 2010 09:37:31 +0000 (+0000)
Subject: Relevant BUGIDs:
X-Git-Tag: v1.1.4~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff1e893b0e22e6848d78ae8094d1e10e3993ed7b;p=linux-pam

Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------
2010-11-18  Tomas Mraz  <tm@t8m.info>

        * modules/pam_limits/pam_limits.c (pam_parse,pam_sm_open_session):
        Drop obsolete and broken option change_uid.
        * modules/pam_limits/pam_limits.8.xml: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 41d782f2..b8cde262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-18  Tomas Mraz  <tm@t8m.info>
+
+	* modules/pam_limits/pam_limits.c (pam_parse,pam_sm_open_session):
+	Drop obsolete and broken option change_uid.
+	* modules/pam_limits/pam_limits.8.xml: Likewise.
+
 2010-11-16  Tomas Mraz  <tm@t8m.info>
 
 	* modules/pam_pwhistory/pam_pwhistory.c (pam_sm_chauthtok): Remove
diff --git a/modules/pam_limits/pam_limits.8.xml b/modules/pam_limits/pam_limits.8.xml
index 0be7ef4d..7b944f9e 100644
--- a/modules/pam_limits/pam_limits.8.xml
+++ b/modules/pam_limits/pam_limits.8.xml
@@ -22,9 +22,6 @@
   <refsynopsisdiv>
     <cmdsynopsis id="pam_limits-cmdsynopsis">
       <command>pam_limits.so</command>
-      <arg choice="opt">
-        change_uid
-      </arg>
       <arg choice="opt">
         conf=<replaceable>/path/to/limits.conf</replaceable>
       </arg>
@@ -70,19 +67,6 @@
   <refsect1 id="pam_limits-options">
     <title>OPTIONS</title>
     <variablelist>
-      <varlistentry>
-        <term>
-          <option>change_uid</option>
-        </term>
-        <listitem>
-          <para>
-            Change real uid to the user for who the limits are set up. Use this
-            option if you have problems like login not forking a shell for user
-            who has no processes. Be warned that something else may break when
-            you do this.
-          </para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term>
           <option>conf=<replaceable>/path/to/limits.conf</replaceable></option>
diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c
index f446f9e3..79cc717e 100644
--- a/modules/pam_limits/pam_limits.c
+++ b/modules/pam_limits/pam_limits.c
@@ -103,7 +103,6 @@ struct pam_limit_s {
 /* argument parsing */
 
 #define PAM_DEBUG_ARG       0x0001
-#define PAM_DO_SETREUID     0x0002
 #define PAM_UTMP_EARLY      0x0004
 #define PAM_NO_AUDIT        0x0008
 
@@ -127,8 +126,6 @@ _pam_parse (const pam_handle_t *pamh, int argc, const char **argv,
 	    ctrl |= PAM_DEBUG_ARG;
 	} else if (!strncmp(*argv,"conf=",5)) {
 	    pl->conf_file = *argv+5;
-	} else if (!strncmp(*argv,"change_uid",10)) {
-	    ctrl |= PAM_DO_SETREUID;
 	} else if (!strcmp(*argv,"utmp_early")) {
 	    ctrl |= PAM_UTMP_EARLY;
 	} else if (!strcmp(*argv,"noaudit")) {
@@ -777,10 +774,6 @@ out:
 	return retval;
     }
 
-    if (ctrl & PAM_DO_SETREUID) {
-	setreuid(pwd->pw_uid, -1);
-    }
-
     retval = setup_limits(pamh, pwd->pw_name, pwd->pw_uid, ctrl, pl);
     if (retval & LOGIN_ERR)
 	pam_error(pamh, _("Too many logins for '%s'."), pwd->pw_name);