auto-import changelog data from yp-tools-2.7-1.src.rpm
Tue Jun 11 2002 Alexander Larsson <alexl@redhat.com> - Update to 2.7 from upstream - Updated yppasswd md5 patch Thu May 23 2002 Tim Powers <timp@redhat.com> - automated rebuild
This commit is contained in:
cvsdist
parent
3da96e4b62
commit
fc9b6c42c8
|
|
@ -1 +1 @@
|
|||
yp-tools-2.6.tar.bz2
|
||||
yp-tools-2.7.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
3fa285adba6ec2e236d124fb02361303 yp-tools-2.6.tar.bz2
|
||||
8d8d2c1c8b4a7e2027215aebe086f651 yp-tools-2.7.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
--- yp-tools-2.7/src/yppasswd.c.md5 Tue Jun 11 06:26:00 2002
|
||||
+++ yp-tools-2.7/src/yppasswd.c Tue Jun 11 06:30:18 2002
|
||||
@@ -49,6 +49,8 @@
|
||||
#include <locale.h>
|
||||
#include <libintl.h>
|
||||
#include <sys/param.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <rpcsvc/yp_prot.h>
|
||||
#include <rpcsvc/ypclnt.h>
|
||||
@@ -436,11 +438,44 @@
|
||||
|
||||
#endif
|
||||
|
||||
+#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
|
||||
+
|
||||
+static void
|
||||
+create_random_salt (char *salt, int num_chars)
|
||||
+{
|
||||
+ int fd;
|
||||
+ unsigned char c;
|
||||
+ int i;
|
||||
+ int res;
|
||||
+
|
||||
+ fd = open("/dev/urandom", O_RDONLY);
|
||||
+
|
||||
+ for (i = 0; i < num_chars; i++)
|
||||
+ {
|
||||
+ res = 0;
|
||||
+
|
||||
+ if (fd != 0)
|
||||
+ res = read (fd, &c, 1);
|
||||
+
|
||||
+ if (res != 1)
|
||||
+ c = random();
|
||||
+
|
||||
+ salt[i] = bin_to_ascii(c & 0x3f);
|
||||
+ }
|
||||
+
|
||||
+ salt[num_chars] = 0;
|
||||
+
|
||||
+ if (fd != 0)
|
||||
+ close (fd);
|
||||
+}
|
||||
+
|
||||
+
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
char *s, *progname, *domainname = NULL, *user = NULL, *master = NULL;
|
||||
int f_flag = 0, l_flag = 0, p_flag = 0, error, status;
|
||||
+ int has_md5_passwd = 0;
|
||||
struct yppasswd yppwd;
|
||||
struct passwd *pwd;
|
||||
CLIENT *clnt;
|
||||
@@ -451,6 +486,8 @@
|
||||
bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
textdomain (PACKAGE);
|
||||
|
||||
+ srandom (time (NULL));
|
||||
+
|
||||
if ((s = strrchr (argv[0], '/')) != NULL)
|
||||
progname = s + 1;
|
||||
else
|
||||
@@ -642,6 +679,9 @@
|
||||
cp = stpcpy (hashpass, "##");
|
||||
strcpy (cp, pwd->pw_name);
|
||||
|
||||
+ if (strncmp(pwd->pw_passwd, "$1$", 3) == 0)
|
||||
+ has_md5_passwd = 1;
|
||||
+
|
||||
/* We can't check the password with shadow passwords enabled. We
|
||||
* leave the checking to yppasswdd */
|
||||
if (uid != 0 && strcmp (pwd->pw_passwd, "x") != 0 &&
|
||||
@@ -675,13 +715,11 @@
|
||||
|
||||
if (p_flag)
|
||||
{
|
||||
-#define bin_to_ascii(c) ((c)>=38?((c)-38+'a'):(c)>=12?((c)-12+'A'):(c)+'.')
|
||||
#ifdef USE_CRACKLIB
|
||||
char *error_msg;
|
||||
#endif /* USE_CRACKLIB */
|
||||
- char *buf, salt[2], *p = NULL;
|
||||
+ char *buf, salt[12], *p = NULL;
|
||||
int tries = 0;
|
||||
- time_t tm;
|
||||
|
||||
buf = (char *) malloc (129);
|
||||
|
||||
@@ -732,9 +770,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
- time (&tm);
|
||||
- salt[0] = bin_to_ascii (tm & 0x3f);
|
||||
- salt[1] = bin_to_ascii ((tm >> 6) & 0x3f);
|
||||
+ if (!has_md5_passwd)
|
||||
+ create_random_salt (salt, 2);
|
||||
+ else
|
||||
+ {
|
||||
+ /* The user already had a MD5 password, so it's safe to
|
||||
+ * use a MD5 password again */
|
||||
+ strcpy (salt, "$1$");
|
||||
+ create_random_salt (salt+3, 8);
|
||||
+ }
|
||||
|
||||
yppwd.newpw.pw_passwd = strdup (crypt (buf, salt));
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
Summary: NIS (or YP) client programs.
|
||||
Name: yp-tools
|
||||
Version: 2.6
|
||||
Release: 4
|
||||
Version: 2.7
|
||||
Release: 1
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
|
||||
Url: http://www-vt.uni-paderborn.de/~kukuk/linux/nis.html
|
||||
Patch1: yp-tools-2.6-passwd.patch
|
||||
Patch1: yp-tools-2.7-md5.patch
|
||||
Obsoletes: yppasswd, yp-clients
|
||||
Requires: ypbind
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
|
@ -59,6 +59,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%dir /var/yp
|
||||
|
||||
%changelog
|
||||
* Tue Jun 11 2002 Alexander Larsson <alexl@redhat.com>
|
||||
- Update to 2.7 from upstream
|
||||
- Updated yppasswd md5 patch
|
||||
|
||||
* Thu May 23 2002 Tim Powers <timp@redhat.com>
|
||||
- automated rebuild
|
||||
|
||||
* Mon Mar 25 2002 Alex Larsson <alexl@redhat.com> 2.6-4
|
||||
- Updated passwd patch with Nalins comments
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue