[Pkg-shadow-commits] r2363 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sat Sep 6 23:46:45 UTC 2008
Author: nekral-guest
Date: 2008-09-06 23:46:44 +0000 (Sat, 06 Sep 2008)
New Revision: 2363
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/chage.c
upstream/trunk/src/chfn.c
upstream/trunk/src/chgpasswd.c
upstream/trunk/src/chpasswd.c
upstream/trunk/src/chsh.c
upstream/trunk/src/groupadd.c
upstream/trunk/src/groupdel.c
upstream/trunk/src/groupmems.c
upstream/trunk/src/groupmod.c
upstream/trunk/src/newusers.c
upstream/trunk/src/useradd.c
upstream/trunk/src/userdel.c
upstream/trunk/src/usermod.c
Log:
Additional PAM cleanup:
* src/userdel.c, src/newusers.c, src/chpasswd.c, src/chfn.c,
src/groupmems.c, src/usermod.c, src/groupdel.c, src/chgpasswd.c,
src/useradd.c, src/groupmod.c, src/groupadd.c, src/chage.c,
src/chsh.c: If the username cannot be determined, report it as
such (not a PAM authentication failure).
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/ChangeLog 2008-09-06 23:46:44 UTC (rev 2363)
@@ -56,7 +56,8 @@
src/useradd.c, src/groupmod.c, src/groupadd.c, src/chage.c,
src/chsh.c: Simplify the PAM error handling. Do not keep the pamh
handle, but terminate the PAM transaction as soon as possible if
- there are no PAM session opened.
+ there are no PAM session opened. If the username cannot be
+ determined, report it as such (not a PAM authentication failure).
* src/useradd.c, src/userdel.c, src/usermod.c: It is no more
needed to initialize retval to PAM_SUCCESS.
Modified: upstream/trunk/src/chage.c
===================================================================
--- upstream/trunk/src/chage.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/chage.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -509,11 +509,14 @@
#ifdef USE_PAM
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("chage", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (E_NOPERM);
}
+ retval = pam_start ("chage", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/chfn.c
===================================================================
--- upstream/trunk/src/chfn.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/chfn.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -377,11 +377,14 @@
#else /* !USE_PAM */
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("chfn", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (E_NOPERM);
}
+ retval = pam_start ("chfn", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/chgpasswd.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -256,11 +256,14 @@
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("chgpasswd", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (1);
}
+ retval = pam_start ("chgpasswd", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/chpasswd.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -250,11 +250,14 @@
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("chpasswd", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (1);
}
+ retval = pam_start ("chpasswd", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/chsh.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -306,11 +306,14 @@
#else /* !USE_PAM */
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("chsh", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (E_NOPERM);
}
+ retval = pam_start ("chsh", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/groupadd.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -575,11 +575,14 @@
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("groupadd", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (1);
}
+ retval = pam_start ("groupadd", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/groupdel.c
===================================================================
--- upstream/trunk/src/groupdel.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/groupdel.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -346,11 +346,13 @@
struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (pampw == NULL) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("groupdel", pampw->pw_name,
- &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (1);
}
+
+ retval = pam_start ("groupdel", pampw->pw_name, &conv, &pamh);
}
if (PAM_SUCCESS == retval) {
Modified: upstream/trunk/src/groupmems.c
===================================================================
--- upstream/trunk/src/groupmems.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/groupmems.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -445,12 +445,14 @@
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("groupmems", pampw->pw_name,
- &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ fail_exit (1);
}
+ retval = pam_start ("groupmems", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/groupmod.c
===================================================================
--- upstream/trunk/src/groupmod.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/groupmod.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -711,11 +711,13 @@
struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pamh) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("groupmod", pampw->pw_name,
- &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ fail_exit (1);
}
+
+ retval = pam_start ("groupmod", pampw->pw_name, &conv, &pamh);
}
if (PAM_SUCCESS == retval) {
Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/newusers.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -571,11 +571,14 @@
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (NULL == pampw) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("newusers", pampw->pw_name, &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ fail_exit (1);
}
+ retval = pam_start ("newusers", pampw->pw_name, &conv, &pamh);
+
if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0);
}
Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/useradd.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -1795,11 +1795,13 @@
struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (pampw == NULL) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("useradd", pampw->pw_name,
- &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ fail_exit (1);
}
+
+ retval = pam_start ("useradd", pampw->pw_name, &conv, &pamh);
}
if (PAM_SUCCESS == retval) {
Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/userdel.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -840,11 +840,13 @@
struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (pampw == NULL) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("userdel", pampw->pw_name,
- &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (E_PW_UPDATE);
}
+
+ retval = pam_start ("userdel", pampw->pw_name, &conv, &pamh);
}
if (PAM_SUCCESS == retval) {
Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c 2008-09-06 22:52:35 UTC (rev 2362)
+++ upstream/trunk/src/usermod.c 2008-09-06 23:46:44 UTC (rev 2363)
@@ -1661,11 +1661,13 @@
struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (pampw == NULL) {
- retval = PAM_USER_UNKNOWN;
- } else {
- retval = pam_start ("usermod", pampw->pw_name,
- &conv, &pamh);
+ fprintf (stderr,
+ _("%s: Cannot determine your user name.\n"),
+ Prog);
+ exit (1);
}
+
+ retval = pam_start ("usermod", pampw->pw_name, &conv, &pamh);
}
if (PAM_SUCCESS == retval) {
More information about the Pkg-shadow-commits
mailing list