Import smbfs-1.4.3.

This commit is contained in:
Sheldon Hearn 2001-12-26 15:35:10 +00:00
parent df3342d686
commit 8d4076f081
3 changed files with 13 additions and 9 deletions

View File

@ -1,3 +1,7 @@
26.12.2001 1.4.3
- Additional cleanups for FreeBSD builds.
- Charset specifications now accepted in the [default] section.
20.12.2001 1.4.2 (interim)
- Various merges (but not all) from Darwin project.
- Minor man pages corrections.

View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ctx.c,v 1.21 2001/04/06 15:47:14 bp Exp $
* $Id: ctx.c,v 1.22 2001/12/26 04:10:52 bp Exp $
*/
#include <sys/param.h>
#include <sys/sysctl.h>
@ -615,7 +615,7 @@ smb_ctx_lookup(struct smb_ctx *ctx, int level, int flags)
}
error = smb_ctx_gethandle(ctx);
if (error) {
smb_error("can't get handle to requester (no /dev/net/nsmb* device)", 0);
smb_error("can't get handle to requester (no /dev/"NSMB_NAME"* device)", 0);
return EINVAL;
}
bzero(&rq, sizeof(rq));
@ -696,7 +696,7 @@ smb_ctx_readrcsection(struct smb_ctx *ctx, const char *sname, int level)
char *p;
int error;
if (level > 0) {
if (level >= 0) {
rc_getstringptr(smb_rc, sname, "charsets", &p);
if (p) {
error = smb_ctx_setcharset(ctx, p);

View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: mount_smbfs.c,v 1.15 2001/12/20 15:03:41 bp Exp $
* $Id: mount_smbfs.c,v 1.16 2001/12/26 04:09:57 bp Exp $
*/
#include <sys/param.h>
#include <sys/stat.h>
@ -61,7 +61,7 @@ static void usage(void);
static struct mntopt mopts[] = {
MOPT_STDOPTS,
{ NULL }
{ NULL, 0, 0, 0 }
};
@ -269,10 +269,10 @@ static void
usage(void)
{
fprintf(stderr, "%s\n%s\n%s\n%s\n",
"usage: mount_smbfs [-Chv] [-U user] [-connection options]",
" [-M mode] [-c case] [-d mode] [-f mode]",
" [-g gid] [-l locale] [-n os2] [-u uid] [-w scheme]",
" /user@server/share node");
"usage: mount_smbfs [-E cs1:cs2] [-I host] [-L locale] [-M crights:srights]",
" [-N] [-O cowner:cgroup/sowner:sgroup] [-R retrycount]",
" [-T timeout] [-W workgroup] [-c case] [-d mode] [-f mode]",
" [-g gid] [-n opt] [-u uid] //user@server/share node");
exit (1);
}