[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4600-ga679d0e
sfrench at samba.org
sfrench at samba.org
Fri Dec 5 14:35:28 GMT 2008
The branch, v3-3-test has been updated
via a679d0e96ec54f4660537966b31ce2f56d5a1ea9 (commit)
from dda44029e98d581e358146443d66d3e243163f15 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit a679d0e96ec54f4660537966b31ce2f56d5a1ea9
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Fri Dec 5 08:33:39 2008 -0600
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
-----------------------------------------------------------------------
Summary of changes:
source/client/mount.cifs.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index da2f98b..0bc61ae 100644
--- a/source/client/mount.cifs.c
+++ b/source/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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list