VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

466_fflush-prompt was applied upstream.

Browse Source
This commit is contained in:
nekral-guest
2008-03-19 18:45:41 +00:00
parent 8779ad5ec2
commit 86aaea0978
3 changed files with 1 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+1
View File
@@ -11,6 +11,7 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low
+ debian/patches/451_login_PATH
+ debian/patches/462_warn_to_edit_shadow
+ debian/patches/467_useradd_-r_LSB
+ debian/patches/466_fflush-prompt
* debian/watch: Add a watch file for shadow.
-- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net> Sun, 24 Feb 2008 18:33:31 +0100
debian/patches/466_fflush-prompt
Vendored
-314
View File
@@ -1,314 +0,0 @@
Goal: Fflush all prompts supposedly presented to a user, because we may
conversate with a script (over pipe) instead. See bug #333138.
Status wrt upstream: may appear in 4.0.14
Index: shadow-4.1.0/libmisc/Makefile.am
===================================================================
--- shadow-4.1.0.orig/libmisc/Makefile.am
+++ shadow-4.1.0/libmisc/Makefile.am
@@ -55,4 +55,5 @@
xgetgrnam.c \
xgetgrgid.c \
xgetspnam.c \
- xmalloc.c
+ xmalloc.c \
+ yesno.c
Index: shadow-4.1.0/libmisc/fields.c
===================================================================
--- shadow-4.1.0.orig/libmisc/fields.c
+++ shadow-4.1.0/libmisc/fields.c
@@ -71,6 +71,7 @@
maxsize = sizeof (newf);
printf ("\t%s [%s]: ", prompt, buf);
+ fflush (stdout);
if (fgets (newf, maxsize, stdin) != newf)
return;
Index: shadow-4.1.0/libmisc/yesno.c
===================================================================
--- /dev/null
+++ shadow-4.1.0/libmisc/yesno.c
@@ -0,0 +1,41 @@
+/*
+ * Common code for yes/no prompting
+ *
+ * Used by pwck.c and grpck.c
+ */
+
+#include <config.h> /* configuration parameters like e.g. ENABLE_NLS */
+
+#ident "$Id$"
+
+#include <stdio.h> /* printf(), fflush() & fgets() */
+#include "defines.h" /* _() macro */
+
+/*
+ * yes_or_no - get answer to question from the user
+ */
+int yes_or_no (int read_only)
+{
+ char buf[80];
+
+ /*
+ * In read-only mode all questions are answered "no".
+ */
+ if (read_only) {
+ printf (_("No\n"));
+ return 0;
+ }
+
+ /*
+ * Typically, there's a prompt on stdout, sometimes unflushed.
+ */
+ fflush (stdout);
+
+ /*
+ * Get a line and see what the first character is.
+ */
+ if (fgets (buf, sizeof buf, stdin))
+ return buf[0] == 'y' || buf[0] == 'Y';
+
+ return 0;
+}
Index: shadow-4.1.0/src/grpck.c
===================================================================
--- shadow-4.1.0.orig/src/grpck.c
+++ shadow-4.1.0/src/grpck.c
@@ -50,6 +50,8 @@
extern struct commonio_entry *__sgr_get_head (void);
#endif
+extern int yes_or_no (int);
+
/*
* Exit codes
*/
@@ -74,7 +76,6 @@
/* local function prototypes */
static void usage (void);
-static int yes_or_no (void);
static void delete_member (char **, const char *);
/*
@@ -91,30 +92,6 @@
}
/*
- * yes_or_no - get answer to question from the user
- */
-static int yes_or_no (void)
-{
- char buf[80];
-
- /*
- * In read-only mode all questions are answered "no".
- */
- if (read_only) {
- printf (_("No\n"));
- return 0;
- }
-
- /*
- * Get a line and see what the first character is.
- */
- if (fgets (buf, sizeof buf, stdin))
- return buf[0] == 'y' || buf[0] == 'Y';
-
- return 0;
-}
-
-/*
* delete_member - delete an entry in a list of members
*/
static void delete_member (char **list, const char *member)
@@ -301,7 +278,7 @@
* prompt the user to delete the entry or not
*/
if (!prune) {
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
} else {
puts (_("Yes"));
@@ -361,7 +338,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_gr;
}
@@ -398,7 +375,7 @@
grp->gr_name, grp->gr_mem[i]);
printf (_("delete member '%s'? "), grp->gr_mem[i]);
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
SYSLOG ((LOG_INFO, "delete member '%s' group '%s'",
@@ -423,7 +400,7 @@
printf (_("add group '%s' in %s ?"),
grp->gr_name, sgr_file);
errors++;
- if (yes_or_no ()) {
+ if (yes_or_no (read_only)) {
struct sgrp sg;
struct group gr;
static char *empty = NULL;
@@ -510,7 +487,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
/*
@@ -566,7 +543,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_sg;
}
@@ -579,7 +556,7 @@
grp_file);
printf (_("delete line '%s'? "), sge->line);
errors++;
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_sg;
} else {
/**
@@ -621,7 +598,7 @@
printf (_("delete administrative member '%s'? "),
sgr->sg_adm[i]);
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
SYSLOG ((LOG_INFO,
@@ -649,7 +626,7 @@
sgr->sg_name, sgr->sg_mem[i]);
printf (_("delete member '%s'? "), sgr->sg_mem[i]);
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
SYSLOG ((LOG_INFO,
Index: shadow-4.1.0/src/pwck.c
===================================================================
--- shadow-4.1.0.orig/src/pwck.c
+++ shadow-4.1.0/src/pwck.c
@@ -49,6 +49,8 @@
extern void __spw_del_entry (const struct commonio_entry *);
extern struct commonio_entry *__spw_get_head (void);
+extern int yes_or_no (int);
+
/*
* Exit codes
*/
@@ -73,7 +75,6 @@
/* local function prototypes */
static void usage (void);
-static int yes_or_no (void);
/*
* usage - print syntax message and exit
@@ -86,31 +87,6 @@
}
/*
- * yes_or_no - get answer to question from the user
- */
-static int yes_or_no (void)
-{
- char buf[80];
-
- /*
- * In read-only mode all questions are answered "no".
- */
-
- if (read_only) {
- printf (_("No\n"));
- return 0;
- }
-
- /*
- * Get a line and see what the first character is.
- */
- if (fgets (buf, sizeof buf, stdin))
- return buf[0] == 'y' || buf[0] == 'Y';
-
- return 0;
-}
-
-/*
* pwck - verify password file integrity
*/
int main (int argc, char **argv)
@@ -261,7 +237,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
/*
@@ -316,7 +292,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_pw;
}
@@ -383,7 +359,7 @@
printf (_("add user '%s' in %s? "),
pwd->pw_name, spw_file);
errors++;
- if (yes_or_no ()) {
+ if (yes_or_no (read_only)) {
struct spwd sp;
struct passwd pw;
@@ -462,7 +438,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (!yes_or_no ())
+ if (!yes_or_no (read_only))
continue;
/*
@@ -517,7 +493,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_spw;
}
@@ -538,7 +514,7 @@
/*
* prompt the user to delete the entry or not
*/
- if (yes_or_no ())
+ if (yes_or_no (read_only))
goto delete_spw;
}
debian/patches/series
Vendored
-1
View File
@@ -15,7 +15,6 @@
454_userdel_no_MAIL_FILE
501_commonio_group_shadow
463_login_delay_obeys_to_PAM
466_fflush-prompt
523_su_arguments_are_concatenated
523_su_arguments_are_no_more_concatenated_by_default
579_chowntty_debug