bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 13:30:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

remove 'usentlm' option

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-05-02 13:58:56 +03:00
parent 4068a6955f
commit b87e998e4d
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/datatypes.c
View File

@ -553,10 +553,6 @@ static void * ef_server_singlepacket(struct node * node){
return &((struct srvparam *)node->value) -> singlepacket; return &((struct srvparam *)node->value) -> singlepacket;
} }
static void * ef_server_usentlm(struct node * node){
return &((struct srvparam *)node->value) -> usentlm;
}
static void * ef_server_starttime(struct node * node){ static void * ef_server_starttime(struct node * node){
return &((struct srvparam *)node->value) -> time_start; return &((struct srvparam *)node->value) -> time_start;
} }
@ -728,20 +724,19 @@ static struct property prop_server[] = {
{prop_server + 5, "auth", ef_server_auth, TYPE_STRING, "service authentication type"}, {prop_server + 5, "auth", ef_server_auth, TYPE_STRING, "service authentication type"},
{prop_server + 6, "acl", ef_server_acl, TYPE_ACE, "access control list"}, {prop_server + 6, "acl", ef_server_acl, TYPE_ACE, "access control list"},
{prop_server + 7, "singlepacket", ef_server_singlepacket, TYPE_INTEGER, "is single packet redirection"}, {prop_server + 7, "singlepacket", ef_server_singlepacket, TYPE_INTEGER, "is single packet redirection"},
{prop_server + 8, "usentlm", ef_server_usentlm, TYPE_INTEGER, "allow NTLM authentication"}, {prop_server + 8, "log", ef_server_log, TYPE_STRING, "type of logging"},
{prop_server + 9, "log", ef_server_log, TYPE_STRING, "type of logging"}, {prop_server + 9, "logtarget", ef_server_logtarget, TYPE_STRING, "log target options"},
{prop_server + 10, "logtarget", ef_server_logtarget, TYPE_STRING, "log target options"}, {prop_server + 10, "logformat", ef_server_logformat, TYPE_STRING, "logging format string"},
{prop_server + 11, "logformat", ef_server_logformat, TYPE_STRING, "logging format string"}, {prop_server + 11, "nonprintable", ef_server_nonprintable, TYPE_STRING, "non printable characters"},
{prop_server + 12, "nonprintable", ef_server_nonprintable, TYPE_STRING, "non printable characters"}, {prop_server + 12, "replacement", ef_server_replacement, TYPE_CHAR, "replacement character"},
{prop_server + 13, "replacement", ef_server_replacement, TYPE_CHAR, "replacement character"}, {prop_server + 13, "childcount", ef_server_childcount, TYPE_INTEGER, "number of servers connected"},
{prop_server + 14, "childcount", ef_server_childcount, TYPE_INTEGER, "number of servers connected"}, {prop_server + 14, "intsa", ef_server_intsa, TYPE_SA, "ip address of internal interface"},
{prop_server + 15, "intsa", ef_server_intsa, TYPE_SA, "ip address of internal interface"}, {prop_server + 15, "extsa", ef_server_extsa, TYPE_SA, "ip address of external interface"},
{prop_server + 16, "extsa", ef_server_extsa, TYPE_SA, "ip address of external interface"},
#ifndef NOIPV6 #ifndef NOIPV6
{prop_server + 17, "extsa6", ef_server_extsa6, TYPE_SA, "ipv6 address of external interface"}, {prop_server + 16, "extsa6", ef_server_extsa6, TYPE_SA, "ipv6 address of external interface"},
{prop_server + 18, "child", ef_server_child, TYPE_CLIENT, "connected clients"},
#else
{prop_server + 17, "child", ef_server_child, TYPE_CLIENT, "connected clients"}, {prop_server + 17, "child", ef_server_child, TYPE_CLIENT, "connected clients"},
#else
{prop_server + 16, "child", ef_server_child, TYPE_CLIENT, "connected clients"},
#endif #endif
{NULL, "next", ef_server_next, TYPE_SERVER, "next"} {NULL, "next", ef_server_next, TYPE_SERVER, "next"}
}; };

2
src/proxy.c
View File

@ -1103,7 +1103,7 @@ CLEANRET:
socksend(param, param->clisock, (unsigned char *)proxy_stringtable[11], (int)strlen(proxy_stringtable[11]), conf.timeouts[STRING_S]); socksend(param, param->clisock, (unsigned char *)proxy_stringtable[11], (int)strlen(proxy_stringtable[11]), conf.timeouts[STRING_S]);
} }
else if(param->res < 10) { else if(param->res < 10) {
socksend(param, param->clisock, (unsigned char *)proxy_stringtable[param->srv->usentlm?12:7], (int)strlen(proxy_stringtable[param->srv->usentlm?12:7]), conf.timeouts[STRING_S]); socksend(param, param->clisock, (unsigned char *)proxy_stringtable[7], (int)strlen(proxy_stringtable[7]), conf.timeouts[STRING_S]);
} }
else if(param->res == 999) { else if(param->res == 999) {
socksend(param, param->clisock, (unsigned char *)proxy_stringtable[4], (int)strlen(proxy_stringtable[4]), conf.timeouts[STRING_S]); socksend(param, param->clisock, (unsigned char *)proxy_stringtable[4], (int)strlen(proxy_stringtable[4]), conf.timeouts[STRING_S]);

4
src/proxymain.c
View File

@ -451,9 +451,6 @@ int MODULEMAINFUNC (int argc, char** argv){
case 'b': case 'b':
srv.bufsize = atoi(argv[i]+2); srv.bufsize = atoi(argv[i]+2);
break; break;
case 'n':
srv.usentlm = atoi(argv[i]+2);
break;
#ifdef STDMAIN #ifdef STDMAIN
#ifndef _WIN32 #ifndef _WIN32
case 'I': case 'I':
@ -1064,7 +1061,6 @@ void srvinit(struct srvparam * srv, struct clientparam *param){
srv->noforce = conf.noforce; srv->noforce = conf.noforce;
srv->logformat = conf.logformat? (unsigned char *)mystrdup((char *)conf.logformat) : NULL; srv->logformat = conf.logformat? (unsigned char *)mystrdup((char *)conf.logformat) : NULL;
srv->authfunc = conf.authfunc; srv->authfunc = conf.authfunc;
srv->usentlm = 0;
srv->maxchild = conf.maxchild; srv->maxchild = conf.maxchild;
srv->backlog = conf.backlog; srv->backlog = conf.backlog;
srv->stacksize = conf.stacksize; srv->stacksize = conf.stacksize;

1
src/structures.h
View File

@ -527,7 +527,6 @@ struct srvparam {
int backlog; int backlog;
int paused, version; int paused, version;
int singlepacket; int singlepacket;
int usentlm;
int needuser; int needuser;
int silent; int silent;
int transparent; int transparent;