1 diff -urN pwdutils-3.2.19.org/lib/Makefile.am pwdutils-3.2.19/lib/Makefile.am
2 --- pwdutils-3.2.19.org/lib/Makefile.am 2005-08-17 16:43:31.000000000 +0200
3 +++ pwdutils-3.2.19/lib/Makefile.am 2018-09-20 14:22:11.787750323 +0200
5 parse_pwent.c yesno.c parse_grent.c strtoid.c \
6 parse_crypt_arg.c utf8conv.c get_ldap_password.c \
7 get_caller_dn.c logging.c remove_gr_mem.c
10 localedir = $(datadir)/locale
11 plugindir = $(libdir)/pwdutils
12 -INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPLUGINDIR=\"$(plugindir)\"
13 +INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPLUGINDIR=\"$(plugindir)\" -I/usr/include/tirpc
16 diff -urN pwdutils-3.2.19.org/lib/public.h pwdutils-3.2.19/lib/public.h
17 --- pwdutils-3.2.19.org/lib/public.h 2018-09-20 14:28:53.953167070 +0200
18 +++ pwdutils-3.2.19/lib/public.h 2018-09-20 14:14:15.923903628 +0200
20 extern char *date2str (time_t date);
21 extern long int str2date (const char *str);
23 -extern int strtoid (const char *arg, uint32_t *idptr) __attribute_warn_unused_result__;
24 +extern int strtoid (const char *arg, u_int32_t *idptr) __attribute_warn_unused_result__;
26 extern int check_name (const char *name) __attribute_warn_unused_result__;
27 extern int check_home (const char *home) __attribute_warn_unused_result__;
28 diff -urN pwdutils-3.2.19.org/lib/strtoid.c pwdutils-3.2.19/lib/strtoid.c
29 --- pwdutils-3.2.19.org/lib/strtoid.c 2006-11-29 14:19:11.000000000 +0100
30 +++ pwdutils-3.2.19/lib/strtoid.c 2018-09-20 14:14:52.878370859 +0200
33 /* convert string into a UID/GID. */
35 -strtoid (const char *arg, uint32_t *idptr)
36 +strtoid (const char *arg, u_int32_t *idptr)
40 diff -urN pwdutils-3.2.19.org/src/Makefile.am pwdutils-3.2.19/src/Makefile.am
41 --- pwdutils-3.2.19.org/src/Makefile.am 2018-09-20 14:28:53.959833937 +0200
42 +++ pwdutils-3.2.19/src/Makefile.am 2018-09-20 14:26:59.779741975 +0200
43 @@ -16,7 +16,7 @@ LDADD = @LIBINTL@
44 localedir = $(datadir)/locale
45 pamdir = $(libdir)/security
47 -INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir) \
48 +INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir) -I/usr/include/tirpc \
49 -DLOCALEDIR=\"$(localedir)\"
51 CLEANFILES = *~ tst-chage.* tst-passwd.* tst-group.* tst-groupadd.* \
54 chage_SOURCES = chage.c
55 chage_CFLAGS = @PIE_CFLAGS@
56 -chage_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
57 +chage_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
58 chage_LDFLAGS = @PIE_LDFLAGS@
61 chfn_CFLAGS = @PIE_CFLAGS@
62 -chfn_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ @NSCD_LIB@
63 +chfn_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ @NSCD_LIB@ -ltirpc
64 chfn_LDFLAGS = @PIE_LDFLAGS@
67 chsh_CFLAGS = @PIE_CFLAGS@
68 -chsh_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
69 +chsh_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
70 chsh_LDFLAGS = @PIE_LDFLAGS@
72 chpasswd_SOURCES = chpasswd.c
73 -chpasswd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @CRYPT_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
74 +chpasswd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @CRYPT_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
76 passwd_SOURCES = passwd.c
77 passwd_CFLAGS = @PIE_CFLAGS@
78 -passwd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ @BIOAPI_LIB@
79 +passwd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ @BIOAPI_LIB@ -ltirpc
80 passwd_LDFLAGS = @PIE_LDFLAGS@
82 rpasswd_SOURCES = rpasswd.c
85 gpasswd_SOURCES = gpasswd.c
86 gpasswd_CFLAGS = @PIE_CFLAGS@
87 -gpasswd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @CRYPT_LIB@ @NSL_LIB@ @LDAP_LIBS@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
88 +gpasswd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @CRYPT_LIB@ @NSL_LIB@ @LDAP_LIBS@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
89 gpasswd_LDFLAGS = @PIE_LDFLAGS@
91 groupadd_SOURCES = groupadd.c
92 -groupadd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
93 +groupadd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
95 groupdel_SOURCES = groupdel.c
96 -groupdel_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
97 +groupdel_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
99 groupmod_SOURCES = groupmod.c
100 -groupmod_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
101 +groupmod_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
103 grpck_SOURCES = grpck.c
104 grpck_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @SELINUX_LIB@ @ATTR_LIB@
105 @@ -116,25 +116,25 @@
106 grpconv_LDADD = ../lib/libpwdutils.a
108 grpunconv_SOURCES = grpunconv.c
109 -grpunconv_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
110 +grpunconv_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
112 pwck_SOURCES = pwck.c
113 pwck_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @SELINUX_LIB@ @ATTR_LIB@
115 pwconv_SOURCES = pwconv.c
116 -pwconv_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
117 +pwconv_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
119 pwunconv_SOURCES = pwunconv.c
120 -pwunconv_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
121 +pwunconv_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
123 useradd_SOURCES = useradd.c
124 -useradd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
125 +useradd_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
127 userdel_SOURCES = userdel.c
128 -userdel_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
129 +userdel_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
131 usermod_SOURCES = usermod.c
132 -usermod_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@
133 +usermod_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @PAM_LIBS@ @LDAP_LIBS@ @NSL_LIB@ @SELINUX_LIB@ @ATTR_LIB@ @NSCD_LIB@ -ltirpc
135 vipw_SOURCES = vipw.c
136 vipw_LDADD = ../lib/libpwdutils.a @DL_LIBS@ @SELINUX_LIB@ @ATTR_LIB@
137 diff -urN pwdutils-3.2.19.org/src/rpasswd-client.c pwdutils-3.2.19/src/rpasswd-client.c
138 --- pwdutils-3.2.19.org/src/rpasswd-client.c 2018-09-20 14:28:53.959833937 +0200
139 +++ pwdutils-3.2.19/src/rpasswd-client.c 2018-09-20 14:23:47.100626914 +0200
143 SSLeay_add_ssl_algorithms ();
144 - meth = SSLv3_client_method ();
145 + meth = SSLv23_client_method ();
146 SSL_load_error_strings ();
147 *ctx = SSL_CTX_new (meth);