From owner-svn-src-head@FreeBSD.ORG  Mon Sep  8 11:01:57 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B4454DF7;
 Mon,  8 Sep 2014 11:01:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A04991B47;
 Mon,  8 Sep 2014 11:01:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88B1vHg000951;
 Mon, 8 Sep 2014 11:01:57 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88B1vib000950;
 Mon, 8 Sep 2014 11:01:57 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201409081101.s88B1vib000950@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 8 Sep 2014 11:01:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271259 - head/contrib/smbfs/lib/smb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Sep 2014 11:01:57 -0000

Author: trasz
Date: Mon Sep  8 11:01:57 2014
New Revision: 271259
URL: http://svnweb.freebsd.org/changeset/base/271259

Log:
  Make it possible to use empty user name ("-U ''") for mount_smbfs(8).
  It's just like "-U guest", except that it actually works, at least
  with Samba 4, which seems to return authentication failure for "-U guest".
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/contrib/smbfs/lib/smb/ctx.c

Modified: head/contrib/smbfs/lib/smb/ctx.c
==============================================================================
--- head/contrib/smbfs/lib/smb/ctx.c	Mon Sep  8 10:57:43 2014	(r271258)
+++ head/contrib/smbfs/lib/smb/ctx.c	Mon Sep  8 11:01:57 2014	(r271259)
@@ -191,10 +191,6 @@ smb_ctx_parseunc(struct smb_ctx *ctx, co
 			smb_error("no user name required", 0);
 			return EINVAL;
 		}
-		if (*p1 == 0) {
-			smb_error("empty user name", 0);
-			return EINVAL;
-		}
 		error = smb_ctx_setuser(ctx, tmp);
 		if (error)
 			return error;
@@ -521,11 +517,6 @@ smb_ctx_resolve(struct smb_ctx *ctx)
 		smb_error("no server name specified", 0);
 		return EINVAL;
 	}
-	if (ssn->ioc_user[0] == 0) {
-		smb_error("no user name specified for server %s",
-		    0, ssn->ioc_srvname);
-		return EINVAL;
-	}
 	if (ctx->ct_minlevel >= SMBL_SHARE && sh->ioc_share[0] == 0) {
 		smb_error("no share name specified for %s@%s",
 		    0, ssn->ioc_user, ssn->ioc_srvname);