mirror of
git://slackware.nl/current.git
synced 2025-01-15 15:41:54 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
159 lines
4.3 KiB
Diff
159 lines
4.3 KiB
Diff
--- ./scheduler/auth.c.orig 2018-03-22 22:48:36.000000000 -0500
|
|
+++ ./scheduler/auth.c 2018-03-28 23:26:32.100862569 -0500
|
|
@@ -71,9 +71,6 @@
|
|
static int compare_locations(cupsd_location_t *a,
|
|
cupsd_location_t *b);
|
|
static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data);
|
|
-#if !HAVE_LIBPAM
|
|
-static char *cups_crypt(const char *pw, const char *salt);
|
|
-#endif /* !HAVE_LIBPAM */
|
|
static void free_authmask(cupsd_authmask_t *am, void *data);
|
|
#if HAVE_LIBPAM
|
|
static int pam_func(int, const struct pam_message **,
|
|
@@ -694,14 +691,14 @@
|
|
* client...
|
|
*/
|
|
|
|
- pass = cups_crypt(password, pw->pw_passwd);
|
|
+ pass = crypt(password, pw->pw_passwd);
|
|
|
|
if (!pass || strcmp(pw->pw_passwd, pass))
|
|
{
|
|
# ifdef HAVE_SHADOW_H
|
|
if (spw)
|
|
{
|
|
- pass = cups_crypt(password, spw->sp_pwdp);
|
|
+ pass = crypt(password, spw->sp_pwdp);
|
|
|
|
if (pass == NULL || strcmp(spw->sp_pwdp, pass))
|
|
{
|
|
@@ -1995,129 +1992,6 @@
|
|
}
|
|
|
|
|
|
-#if !HAVE_LIBPAM
|
|
-/*
|
|
- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
|
|
- * as needed.
|
|
- */
|
|
-
|
|
-static char * /* O - Encrypted password */
|
|
-cups_crypt(const char *pw, /* I - Password string */
|
|
- const char *salt) /* I - Salt (key) string */
|
|
-{
|
|
- if (!strncmp(salt, "$1$", 3))
|
|
- {
|
|
- /*
|
|
- * Use MD5 passwords without the benefit of PAM; this is for
|
|
- * Slackware Linux, and the algorithm was taken from the
|
|
- * old shadow-19990827/lib/md5crypt.c source code... :(
|
|
- */
|
|
-
|
|
- int i; /* Looping var */
|
|
- unsigned long n; /* Output number */
|
|
- int pwlen; /* Length of password string */
|
|
- const char *salt_end; /* End of "salt" data for MD5 */
|
|
- char *ptr; /* Pointer into result string */
|
|
- _cups_md5_state_t state; /* Primary MD5 state info */
|
|
- _cups_md5_state_t state2; /* Secondary MD5 state info */
|
|
- unsigned char digest[16]; /* MD5 digest result */
|
|
- static char result[120]; /* Final password string */
|
|
-
|
|
-
|
|
- /*
|
|
- * Get the salt data between dollar signs, e.g. $1$saltdata$md5.
|
|
- * Get a maximum of 8 characters of salt data after $1$...
|
|
- */
|
|
-
|
|
- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++)
|
|
- if (*salt_end == '$')
|
|
- break;
|
|
-
|
|
- /*
|
|
- * Compute the MD5 sum we need...
|
|
- */
|
|
-
|
|
- pwlen = strlen(pw);
|
|
-
|
|
- _cupsMD5Init(&state);
|
|
- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
|
|
- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt);
|
|
-
|
|
- _cupsMD5Init(&state2);
|
|
- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
|
|
- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3);
|
|
- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
|
|
- _cupsMD5Finish(&state2, digest);
|
|
-
|
|
- for (i = pwlen; i > 0; i -= 16)
|
|
- _cupsMD5Append(&state, digest, i > 16 ? 16 : i);
|
|
-
|
|
- for (i = pwlen; i > 0; i >>= 1)
|
|
- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1);
|
|
-
|
|
- _cupsMD5Finish(&state, digest);
|
|
-
|
|
- for (i = 0; i < 1000; i ++)
|
|
- {
|
|
- _cupsMD5Init(&state);
|
|
-
|
|
- if (i & 1)
|
|
- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
|
|
- else
|
|
- _cupsMD5Append(&state, digest, 16);
|
|
-
|
|
- if (i % 3)
|
|
- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3);
|
|
-
|
|
- if (i % 7)
|
|
- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
|
|
-
|
|
- if (i & 1)
|
|
- _cupsMD5Append(&state, digest, 16);
|
|
- else
|
|
- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
|
|
-
|
|
- _cupsMD5Finish(&state, digest);
|
|
- }
|
|
-
|
|
- /*
|
|
- * Copy the final sum to the result string and return...
|
|
- */
|
|
-
|
|
- memcpy(result, salt, (size_t)(salt_end - salt));
|
|
- ptr = result + (salt_end - salt);
|
|
- *ptr++ = '$';
|
|
-
|
|
- for (i = 0; i < 5; i ++, ptr += 4)
|
|
- {
|
|
- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8);
|
|
-
|
|
- if (i < 4)
|
|
- n |= (unsigned)digest[i + 12];
|
|
- else
|
|
- n |= (unsigned)digest[5];
|
|
-
|
|
- to64(ptr, n, 4);
|
|
- }
|
|
-
|
|
- to64(ptr, (unsigned)digest[11], 2);
|
|
- ptr += 2;
|
|
- *ptr = '\0';
|
|
-
|
|
- return (result);
|
|
- }
|
|
- else
|
|
- {
|
|
- /*
|
|
- * Use the standard crypt() function...
|
|
- */
|
|
-
|
|
- return (crypt(pw, salt));
|
|
- }
|
|
-}
|
|
-#endif /* !HAVE_LIBPAM */
|
|
-
|
|
-
|
|
/*
|
|
* 'free_authmask()' - Free function for auth masks.
|
|
*/
|