Module Name: src
Committed By: christos
Date: Tue Sep 27 02:05:10 UTC 2011
Modified Files:
src/sys/fs/smbfs: smbfs_smb.c
src/sys/netsmb: smb.h
Log Message:
rename SMBFS_MAXFNAMELEN to SMBFS_MAXNAMLEN for consistency
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netsmb/smb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.41 src/sys/fs/smbfs/smbfs_smb.c:1.42
--- src/sys/fs/smbfs/smbfs_smb.c:1.41 Tue Oct 20 16:55:01 2009
+++ src/sys/fs/smbfs/smbfs_smb.c Mon Sep 26 22:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $ */
+/* $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1122,7 +1122,7 @@ static int
smbfs_findopenLM2(struct smbfs_fctx *ctx, struct smbnode *dnp,
const char *wildcard, int wclen, int attr, struct smb_cred *scred)
{
- ctx->f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
+ ctx->f_name = malloc(SMB_MAXNAMLEN, M_SMBFSDATA, M_WAITOK);
if (ctx->f_name == NULL)
return ENOMEM;
ctx->f_infolevel = SMB_DIALECT(SSTOVC(ctx->f_ssp)) < SMB_DIALECT_NTLM0_12 ?
@@ -1205,7 +1205,7 @@ smbfs_findnextLM2(struct smbfs_fctx *ctx
return EINVAL;
#endif
}
- nmlen = min(size, SMB_MAXFNAMELEN);
+ nmlen = min(size, SMB_MAXNAMLEN);
cp = ctx->f_name;
error = md_get_mem(mbp, cp, nmlen, MB_MSYSTEM);
if (error)
Index: src/sys/netsmb/smb.h
diff -u src/sys/netsmb/smb.h:1.18 src/sys/netsmb/smb.h:1.19
--- src/sys/netsmb/smb.h:1.18 Mon Sep 26 21:16:35 2011
+++ src/sys/netsmb/smb.h Mon Sep 26 22:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smb.h,v 1.18 2011/09/27 01:16:35 christos Exp $ */
+/* $NetBSD: smb.h,v 1.19 2011/09/27 02:05:10 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -394,6 +394,7 @@ enum smb_dialects {
#define SMB_MAXSHARENAMELEN 128
#define SMB_MAXPKTLEN 0x1FFFF
#define SMB_MAXCHALLENGELEN 8
+#define SMB_MAXNAMLEN 255
#define SMB_MAXRCN 3 /* number of reconnect attempts */
