Merge remote-tracking branch 'origin/master' into devel

This commit is contained in:
Vladimir Dubrovin 2014-04-15 02:15:08 +04:00
commit cb7d48c9c5

View File

@ -377,7 +377,7 @@ for(;;){
continue; continue;
} }
#ifndef NOCRYPT #ifndef NOCRYPT
if(!strncasecmp((char *)sb, "ntlm", 4)){ if(param->srv->usentlm && !strncasecmp((char *)sb, "ntlm", 4)){
sb+=4; sb+=4;
while(isspace(*sb))sb++; while(isspace(*sb))sb++;
i = de64(sb, username, 1023); i = de64(sb, username, 1023);