Module Name: src
Committed By: nakayama
Date: Sat Nov 15 18:55:26 UTC 2014
Modified Files:
src/external/bsd/smbfs/dist/lib/smb: ctx.c
Log Message:
Disable unused codes that causes SIGBUS or SIGSEGV if character
sets option (-E) is specified to mount_smbfs/rump_smbfs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/smbfs/dist/lib/smb/ctx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/smbfs/dist/lib/smb/ctx.c
diff -u src/external/bsd/smbfs/dist/lib/smb/ctx.c:1.2 src/external/bsd/smbfs/dist/lib/smb/ctx.c:1.3
--- src/external/bsd/smbfs/dist/lib/smb/ctx.c:1.2 Wed Dec 25 22:03:15 2013
+++ src/external/bsd/smbfs/dist/lib/smb/ctx.c Sat Nov 15 18:55:26 2014
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ctx.c,v 1.2 2013/12/25 22:03:15 christos Exp $");
+__RCSID("$NetBSD: ctx.c,v 1.3 2014/11/15 18:55:26 nakayama Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -501,8 +501,10 @@ smb_ctx_resolve(struct smb_ctx *ctx)
struct sockaddr *sap;
struct sockaddr_nb *salocal, *saserver;
char *cp;
+#ifdef notyet
u_char cstbl[256];
u_int i;
+#endif
int error = 0;
ctx->ct_flags &= ~SMBCF_RESOLVED;
@@ -531,6 +533,7 @@ smb_ctx_resolve(struct smb_ctx *ctx)
error = smb_addiconvtbl("toupper", ssn->ioc_localcs, nls_upper);
if (error)
return error;
+#ifdef notyet
if (ssn->ioc_servercs[0] != 0) {
for(i = 0; i < sizeof(cstbl); i++)
cstbl[i] = i;
@@ -545,6 +548,7 @@ smb_ctx_resolve(struct smb_ctx *ctx)
if (error)
return error;
}
+#endif
if (ctx->ct_srvaddr) {
error = nb_resolvehost_in(ctx->ct_srvaddr, &sap);
} else {
