-
Notifications
You must be signed in to change notification settings - Fork 38
/
Copy pathalpine.patch
50 lines (47 loc) · 1.62 KB
/
alpine.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
diff --git a/libhttp/ssl.c b/libhttp/ssl.c
index 6d09035..5fc9bdc 100644
--- a/libhttp/ssl.c
+++ b/libhttp/ssl.c
@@ -1016,11 +1016,11 @@ int sslPromoteToSSL(struct SSLSupport *ssl, SSL **sslHndl, int fd,
}
BIO *sslGetNextBIO(BIO *b) {
-#if OPENSSL_VERSION_NUMBER <= 0x10100000L
+/*#if OPENSSL_VERSION_NUMBER <= 0x10100000L
return b->next_bio;
-#else
+#else*/
return BIO_next(b);
-#endif
+//#endif
}
void sslFreeHndl(SSL **sslHndl) {
diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
index ba54b36..96f0585 100644
--- a/shellinabox/launcher.c
+++ b/shellinabox/launcher.c
@@ -1573,19 +1573,19 @@ static void childProcess(struct Service *service, int width, int height,
#ifdef HAVE_UTMPX_H
if (enableUtmpLogging) {
setutxent();
- struct utmpx utmpx = utmp->utmpx;
+ struct utmpx utmpxx = utmp->utmpx;
if (service->useLogin || service->authUser) {
- utmpx.ut_type = LOGIN_PROCESS;
- memset(utmpx.ut_host, 0, sizeof(utmpx.ut_host));
+ utmpxx.ut_type = LOGIN_PROCESS;
+ memset(utmpxx.ut_host, 0, sizeof(utmpxx.ut_host));
}
- pututxline(&utmpx);
+ pututxline(&utmpxx);
endutxent();
#if defined(HAVE_UPDWTMP) || defined(HAVE_UPDWTMPX)
if (!utmp->useLogin) {
- memset(&utmpx.ut_user, 0, sizeof(utmpx.ut_user));
- strncat(&utmpx.ut_user[0], "LOGIN", sizeof(utmpx.ut_user) - 1);
- updwtmpx("/var/log/wtmp", &utmpx);
+ memset(&utmpxx.ut_user, 0, sizeof(utmpxx.ut_user));
+ strncat(&utmpxx.ut_user[0], "LOGIN", sizeof(utmpxx.ut_user) - 1);
+ updwtmpx("/var/log/wtmp", &utmpxx);
}
#endif
}