c3f10526dc
update to 3.4.9, fix for bnc#891268 (CVE-2014-7141, CVE-2014-7142) OBS-URL: https://build.opensuse.org/request/show/263262 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=61
123 lines
5.0 KiB
Diff
123 lines
5.0 KiB
Diff
Index: helpers/basic_auth/fake/fake.cc
|
|
===================================================================
|
|
--- helpers/basic_auth/fake/fake.cc.orig
|
|
+++ helpers/basic_auth/fake/fake.cc
|
|
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
|
|
|
|
process_options(argc, argv);
|
|
|
|
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", program_name);
|
|
+ debug("%s starting up...\n", program_name);
|
|
|
|
while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
|
|
char *p;
|
|
@@ -112,6 +112,6 @@ main(int argc, char *argv[])
|
|
/* send 'OK' result back to Squid */
|
|
SEND_OK("");
|
|
}
|
|
- debug("%s build " __DATE__ ", " __TIME__ " shutting down...\n", program_name);
|
|
+ debug("%s shutting down...\n", program_name);
|
|
exit(0);
|
|
}
|
|
Index: helpers/external_acl/AD_group/ext_ad_group_acl.cc
|
|
===================================================================
|
|
--- helpers/external_acl/AD_group/ext_ad_group_acl.cc.orig
|
|
+++ helpers/external_acl/AD_group/ext_ad_group_acl.cc
|
|
@@ -800,8 +800,7 @@ main(int argc, char *argv[])
|
|
if (!DefaultDomain)
|
|
DefaultDomain = xstrdup(machinedomain);
|
|
}
|
|
- debug("External ACL win32 group helper build " __DATE__ ", " __TIME__
|
|
- " starting up...\n");
|
|
+ debug("External ACL win32 group helper build starting up...\n");
|
|
if (use_global)
|
|
debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
|
|
if (use_case_insensitive_compare)
|
|
Index: helpers/external_acl/LM_group/ext_lm_group_acl.cc
|
|
===================================================================
|
|
--- helpers/external_acl/LM_group/ext_lm_group_acl.cc.orig
|
|
+++ helpers/external_acl/LM_group/ext_lm_group_acl.cc
|
|
@@ -539,8 +539,7 @@ main(int argc, char *argv[])
|
|
if (!DefaultDomain)
|
|
DefaultDomain = xstrdup(machinedomain);
|
|
}
|
|
- debug("External ACL win32 group helper build " __DATE__ ", " __TIME__
|
|
- " starting up...\n");
|
|
+ debug("External ACL win32 group helper build starting up...\n");
|
|
if (use_global) {
|
|
debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
|
|
}
|
|
Index: helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
|
|
===================================================================
|
|
--- helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc.orig
|
|
+++ helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
|
|
@@ -274,7 +274,7 @@ main(int argc, char *argv[])
|
|
|
|
process_options(argc, argv);
|
|
|
|
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
|
|
+ debug("%s starting up...\n", my_program_name);
|
|
|
|
if (LoadSecurityDll(SSP_NTLM, NEGOTIATE_PACKAGE_NAME) == NULL) {
|
|
fprintf(stderr, "FATAL: %s: can't initialize SSPI, exiting.\n", argv[0]);
|
|
Index: helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
|
|
===================================================================
|
|
--- helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc.orig
|
|
+++ helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
|
|
@@ -611,7 +611,7 @@ main(int argc, char *argv[])
|
|
|
|
process_options(argc, argv);
|
|
|
|
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
|
|
+ debug("%s starting up...\n", my_program_name);
|
|
|
|
if (LoadSecurityDll(SSP_NTLM, NTLM_PACKAGE_NAME) == NULL) {
|
|
fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n");
|
|
Index: helpers/ntlm_auth/fake/ntlm_fake_auth.cc
|
|
===================================================================
|
|
--- helpers/ntlm_auth/fake/ntlm_fake_auth.cc.orig
|
|
+++ helpers/ntlm_auth/fake/ntlm_fake_auth.cc
|
|
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
|
|
|
|
process_options(argc, argv);
|
|
|
|
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
|
|
+ debug("%s starting up...\n", my_program_name);
|
|
|
|
while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
|
|
user[0] = '\0'; /*no user code */
|
|
Index: helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
|
|
===================================================================
|
|
--- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc.orig
|
|
+++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
|
|
@@ -632,7 +632,7 @@ manage_request()
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
- debug("ntlm_auth build " __DATE__ ", " __TIME__ " starting up...\n");
|
|
+ debug("ntlm_auth build starting up...\n");
|
|
|
|
my_program_name = argv[0];
|
|
process_options(argc, argv);
|
|
Index: helpers/url_rewrite/fake/fake.cc
|
|
===================================================================
|
|
--- helpers/url_rewrite/fake/fake.cc.orig
|
|
+++ helpers/url_rewrite/fake/fake.cc
|
|
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
|
|
|
|
process_options(argc, argv);
|
|
|
|
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
|
|
+ debug("%s starting up...\n", my_program_name);
|
|
|
|
while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
|
|
char *p;
|
|
@@ -117,6 +117,6 @@ main(int argc, char *argv[])
|
|
/* send 'no-change' result back to Squid */
|
|
fprintf(stdout,"\n");
|
|
}
|
|
- debug("%s build " __DATE__ ", " __TIME__ " shutting down...\n", my_program_name);
|
|
+ debug("%s shutting down...\n", my_program_name);
|
|
exit(0);
|
|
}
|