[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5013-gc7bf0f4

sfrench at samba.org sfrench at samba.org
Tue Feb 24 18:45:49 GMT 2009


The branch, v3-3-test has been updated
       via  c7bf0f4c222ae46be2a751997e03197832b494cd (commit)
       via  62d967bc389170f41eda0a5af0ad4a9a0b4a2262 (commit)
       via  467c1d137a2bfce2fedb3bc98e647e039073f13f (commit)
      from  53fea3a7aef481151c3a15d01481cb0f11ae2e8b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit c7bf0f4c222ae46be2a751997e03197832b494cd
Author: Steve French <smfrench at gmail.com>
Date:   Tue Feb 24 12:43:12 2009 -0600

    cifs mount did not properly display version string when no other parameters passed in.
    
    Acked-by: Jeff Layton <jlayton at redhat.com>

commit 62d967bc389170f41eda0a5af0ad4a9a0b4a2262
Merge: 467c1d137a2bfce2fedb3bc98e647e039073f13f 53fea3a7aef481151c3a15d01481cb0f11ae2e8b
Author: Steve French <stevef at smfhomehp.(none)>
Date:   Tue Feb 24 11:26:56 2009 -0600

    Merge branch 'v3-3-test' of git://git.samba.org/samba into 3-3

commit 467c1d137a2bfce2fedb3bc98e647e039073f13f
Author: Steve French <stevef at smfhomehp.(none)>
Date:   Thu Dec 4 18:22:59 2008 -0600

    mount.cifs: make cifs mounts honor the USER environment variable
    
    If the user is not specified in the mount command or in a credential
    file, then we are supposed to look for the USER environment variable
    (this is usually, but not always set to the username of the current
    uid, but it can be overridden by the user, which we were not checking)
    
    Fixes samba bugzilla bug# 5934

-----------------------------------------------------------------------

Summary of changes:
 source/client/mount.cifs.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index a736609..67e964d 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -1079,6 +1079,14 @@ int main(int argc, char ** argv)
 		}
 		mountpoint = argv[2];
 	} else {
+		if ((strcmp (argv[1], "--version") == 0) ||
+		    ((strcmp (argv[1], "-V") == 0))) {
+			printf ("mount.cifs version: %s.%s%s\n",
+			MOUNT_CIFS_VERSION_MAJOR,
+			MOUNT_CIFS_VERSION_MINOR,
+			MOUNT_CIFS_VENDOR_SUFFIX);
+			exit (0);
+		}
 		mount_cifs_usage();
 		exit(EX_USAGE);
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list