mount.cifs: if mount user not specified use USER environment variable

smbfs also would use the USER environment variable if the user was not
specified on the mount command and no credential file specified, and
mount.cifs man page says that we will use this environment variable
(in most cases this will not cause a behavior change, because
we were doing getuid of the current process which will usually be
the same name).

Fixes Samba bug #5934

Acked-by: Jeff Layton

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index da2f98bff86e8f1f9ac19962a19cd688165b447c..0bc61ae38f720954716543a35a17bb3e3b8923a3 100644 (file)
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -1293,7 +1293,13 @@ int main(int argc, char ** argv)
        }
 
        if(got_user == 0) {
-               user_name = getusername();
+               /* Note that the password will not be retrieved from the
+                  USER env variable (ie user%password form) as there is
+                  already a PASSWD environment varaible */
+               if (getenv("USER"))
+                       user_name = strdup(getenv("USER"));
+               if (user_name == NULL)
+                       user_name = getusername();
                got_user = 1;
        }