Merge remote-tracking branch 'upstream/master'

diff --cc lib/prototypes.h
Simple merge

diff --cc libmisc/Makefile.am
index 8dc6511c05b1f24072f2d75d467e37b9c223c1d4,2e5b81a75c0037583eece76584fe2ad9fbfc6de5..eb44a569e244c8dbe8902f0baced1051b135b64e
--- 1/libmisc/Makefile.am
--- 2/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@@ -44,8 -44,7 +44,8 @@@ libmisc_a_SOURCES = 
        myname.c \
        obscure.c \
        pam_pass.c \
-       pam_pass_non_interractive.c \
+       pam_pass_non_interactive.c \
 +      prefix_flag.c \
        pwd2spwd.c \
        pwdcheck.c \
        pwd_init.c \

diff --cc src/useradd.c
Simple merge

diff --cc src/userdel.c
Simple merge