[Pkg-shadow-commits] r457 - branches/experimental/debian/patches
Christian Perrier
bubulle at costa.debian.org
Wed Aug 17 09:27:17 UTC 2005
Author: bubulle
Date: 2005-08-17 09:27:16 +0000 (Wed, 17 Aug 2005)
New Revision: 457
Modified:
branches/experimental/debian/patches/357_newgrp-stop_cont-proxy
branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency
Log:
Refresh to apply cleanly on 4.0.12
Modified: branches/experimental/debian/patches/357_newgrp-stop_cont-proxy
===================================================================
--- branches/experimental/debian/patches/357_newgrp-stop_cont-proxy 2005-08-17 09:16:26 UTC (rev 456)
+++ branches/experimental/debian/patches/357_newgrp-stop_cont-proxy 2005-08-17 09:27:16 UTC (rev 457)
@@ -11,18 +11,18 @@
Closes: 314727
(suspend command from su shell fails to return to parent shell)
-Index: shadow-4.0.3/src/newgrp.c
+Index: shadow-4.0.12/src/newgrp.c
===================================================================
---- shadow-4.0.3.orig/src/newgrp.c 2005-06-26 21:57:50.000000000 +0300
-+++ shadow-4.0.3/src/newgrp.c 2005-06-26 22:00:07.000000000 +0300
-@@ -437,9 +437,18 @@
- exit (1);
- } else if (child) {
- /* parent - wait for child to finish, then log session close */
+--- shadow-4.0.12.orig/src/newgrp.c 2005-08-17 11:13:46.000000000 +0200
++++ shadow-4.0.12/src/newgrp.c 2005-08-17 11:18:36.000000000 +0200
+@@ -472,9 +472,18 @@
+ exit (1);
+ } else if (child) {
+ /* parent - wait for child to finish, then log session close */
+ int cst = 0;
- do {
-- pid = waitpid (child, NULL, 0);
-- } while (pid != child);
+ do {
+- pid = waitpid (child, NULL, 0);
+- } while (pid != child);
+ errno = 0;
+ pid = waitpid (child, &cst, WUNTRACED);
+ if (pid == child && WIFSTOPPED(cst)) {
@@ -33,6 +33,6 @@
+ }
+ } while (pid == child && WIFSTOPPED(cst) ||
+ pid != child && errno == EINTR);
- SYSLOG ((LOG_INFO,
- "user `%s' (login `%s' on %s) returned to group `%s'",
- name, loginname, tty,
+ SYSLOG ((LOG_INFO,
+ "user `%s' (login `%s' on %s) returned to group `%s'",
+ name, loginname, tty,
Modified: branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency
===================================================================
--- branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency 2005-08-17 09:16:26 UTC (rev 456)
+++ branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency 2005-08-17 09:27:16 UTC (rev 457)
@@ -7,11 +7,11 @@
files (/etc/shadow for pwck or /etc/gshadow for grpck) when this entry is
present in non-shadowed file and not present in the shadowed file.
-Index: shadow-4.0.3/src/grpck.c
+Index: shadow-4.0.12/src/grpck.c
===================================================================
---- shadow-4.0.3.orig/src/grpck.c 2005-07-08 03:22:42.000000000 +0200
-+++ shadow-4.0.3/src/grpck.c 2005-07-08 03:22:45.000000000 +0200
-@@ -144,7 +144,7 @@
+--- shadow-4.0.12.orig/src/grpck.c 2005-08-17 10:19:54.000000000 +0200
++++ shadow-4.0.12/src/grpck.c 2005-08-17 11:24:46.000000000 +0200
+@@ -143,7 +143,7 @@
{
int arg;
int errors = 0;
@@ -20,7 +20,7 @@
int i;
int prune = 0;
struct commonio_entry *gre, *tgre;
-@@ -337,7 +337,7 @@
+@@ -333,7 +333,7 @@
delete_gr:
SYSLOG ((LOG_INFO, "delete group line `%s'",
gre->line));
@@ -29,7 +29,7 @@
__gr_del_entry (gre);
continue;
-@@ -432,11 +432,78 @@
+@@ -427,11 +427,78 @@
SYSLOG ((LOG_INFO, "delete member `%s' group `%s'",
grp->gr_mem[i], grp->gr_name));
@@ -109,7 +109,7 @@
}
#ifdef SHADOWGRP
-@@ -483,7 +550,7 @@
+@@ -478,7 +545,7 @@
delete_sg:
SYSLOG ((LOG_INFO, "delete shadow line `%s'",
sge->line));
@@ -118,12 +118,12 @@
__sgr_del_entry (sge);
continue;
-@@ -541,12 +608,32 @@
+@@ -536,12 +603,32 @@
* Make sure this entry exists in the /etc/group file.
*/
- if (!gr_locate (sgr->sg_name)) {
-- puts (_("no matching group file entry\n"));
+- printf (_("no matching group file entry\n"));
+ grp = (struct group *)gr_locate (sgr->sg_name);
+ if (grp == NULL) {
+ printf (_("no matching group file entry in %s\n"), grp_file);
@@ -153,7 +153,7 @@
}
/*
-@@ -574,7 +661,7 @@
+@@ -569,7 +656,7 @@
SYSLOG ((LOG_INFO,
"delete admin `%s' from shadow group `%s'",
sgr->sg_adm[i], sgr->sg_name));
@@ -162,7 +162,7 @@
delete_member (sgr->sg_adm, sgr->sg_adm[i]);
sge->changed = 1;
__sgr_set_changed ();
-@@ -603,7 +690,7 @@
+@@ -598,7 +685,7 @@
SYSLOG ((LOG_INFO,
"delete member `%s' from shadow group `%s'",
sgr->sg_mem[i], sgr->sg_name));
@@ -171,7 +171,7 @@
delete_member (sgr->sg_mem, sgr->sg_mem[i]);
sge->changed = 1;
__sgr_set_changed ();
-@@ -614,11 +701,11 @@
+@@ -609,11 +696,11 @@
#endif /* SHADOWGRP */
/*
@@ -185,26 +185,28 @@
write_and_bye:
if (!gr_close ()) {
fprintf (stderr, _("%s: cannot update file %s\n"),
-@@ -650,5 +735,5 @@
+@@ -646,7 +733,7 @@
+ */
if (errors)
- printf (deleted ?
+ printf (changed ?
_("%s: the files have been updated\n") :
_("%s: no changes\n"), Prog);
-Index: shadow-4.0.3/src/pwck.c
+
+Index: shadow-4.0.12/src/pwck.c
===================================================================
---- shadow-4.0.3.orig/src/pwck.c 2002-01-10 14:01:28.000000000 +0100
-+++ shadow-4.0.3/src/pwck.c 2005-07-08 08:48:15.000000000 +0200
-@@ -45,6 +45,7 @@
+--- shadow-4.0.12.orig/src/pwck.c 2005-08-09 17:27:02.000000000 +0200
++++ shadow-4.0.12/src/pwck.c 2005-08-17 11:26:44.000000000 +0200
+@@ -44,6 +44,7 @@
+ extern struct commonio_entry *__pw_get_head (void);
- #ifdef SHADOWPWD
#include "shadowio.h"
+#include "getdef.h"
extern void __spw_del_entry (const struct commonio_entry *);
extern struct commonio_entry *__spw_get_head (void);
- #endif
-@@ -127,7 +128,7 @@
+
+@@ -119,7 +120,7 @@
{
int arg;
int errors = 0;
@@ -213,7 +215,7 @@
struct commonio_entry *pfe, *tpfe;
struct passwd *pwd;
int sort_mode = 0;
-@@ -313,7 +314,7 @@
+@@ -288,7 +289,7 @@
delete_pw:
SYSLOG ((LOG_INFO, "delete passwd line `%s'",
pfe->line));
@@ -222,7 +224,7 @@
__pw_del_entry (pfe);
continue;
-@@ -421,6 +422,55 @@
+@@ -395,6 +396,55 @@
pwd->pw_name, pwd->pw_shell);
errors++;
}
@@ -277,8 +279,8 @@
+#endif
}
- #ifdef SHADOWPWD
-@@ -433,6 +483,13 @@
+ if (!is_shadow)
+@@ -406,6 +456,13 @@
for (spe = __spw_get_head (); spe; spe = spe->next) {
/*
@@ -292,7 +294,7 @@
* If this is a NIS line, skip it. You can't "know" what NIS
* is going to do without directly asking NIS ...
*/
-@@ -474,7 +531,7 @@
+@@ -447,7 +504,7 @@
delete_spw:
SYSLOG ((LOG_INFO, "delete shadow line `%s'",
spe->line));
@@ -301,18 +303,18 @@
__spw_del_entry (spe);
continue;
-@@ -539,7 +596,8 @@
+@@ -512,7 +569,8 @@
* /etc/passwd entry and ask them to delete it.
*/
-- puts (_("no matching password file entry\n"));
+- printf (_("no matching password file entry\n"));
+ printf (_("no matching password file entry in %s\n"),
+ pwd_file);
printf (_("delete line `%s'? "), spe->line);
errors++;
-@@ -567,11 +625,11 @@
- #endif
+@@ -539,11 +597,11 @@
+ shadow_done:
/*
- * All done. If there were no deletions we can just abandon any
@@ -325,10 +327,12 @@
write_and_bye:
if (!pw_close ()) {
fprintf (stderr, _("%s: cannot update file %s\n"),
-@@ -607,5 +665,5 @@
+@@ -576,7 +634,7 @@
+ */
if (errors)
- printf (deleted ?
+ printf (changed ?
_("%s: the files have been updated\n") :
_("%s: no changes\n"), Prog);
+
More information about the Pkg-shadow-commits
mailing list