diff options
| author | Lars Müller <lmuelle@samba.org> | 2006-02-27 14:18:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:50 -0500 |
| commit | 1006c89e1b71b9b9d2c8453e07fd19b223e95415 (patch) | |
| tree | c13891d9b3ad60e99b1ab5443c351c55a873e426 | |
| parent | 94893f645b25f9e923e32b64da9573123c3f776a (diff) | |
| download | samba-1006c89e1b71b9b9d2c8453e07fd19b223e95415.tar.gz samba-1006c89e1b71b9b9d2c8453e07fd19b223e95415.tar.bz2 samba-1006c89e1b71b9b9d2c8453e07fd19b223e95415.zip | |
r13714: Set MOUNT_CIFS_VENDOR_SUFFIX if _SAMBA_BUILD_ is set to
"-"SAMBA_VERSION_OFFICIAL_STRING"-"SAMBA_VERSION_VENDOR_SUFFIX if
SAMBA_VERSION_VENDOR_SUFFIX is set or "-"SAMBA_VERSION_OFFICIAL_STRING
only if MOUNT_CIFS_VENDOR_SUFFIX is undefined.
This results in: mount.cifs -V
mount.cifs version: 1.10-3.1.2pre1-SVN-build-13706-foovendor
or
mount.cifs version: 1.10-3.1.2pre1-SVN-build-13706
Steve: If this is to long or you do not like it, we might add something
lile -VV to report the added part.
(This used to be commit 3c277c7a3cce14f185db7fede7c0c4ab77769670)
| -rwxr-xr-x | source3/client/mount.cifs.c | 13 | ||||
| -rw-r--r-- | source3/client/umount.cifs.c | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index ed88c92c62..dd765c3406 100755 --- a/source3/client/mount.cifs.c +++ b/source3/client/mount.cifs.c @@ -43,8 +43,17 @@ #define MOUNT_CIFS_VERSION_MINOR "10" #ifndef MOUNT_CIFS_VENDOR_SUFFIX -#define MOUNT_CIFS_VENDOR_SUFFIX "" -#endif + #ifdef _SAMBA_BUILD_ + #include "include/version.h" + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #define MOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING"-"SAMBA_VERSION_VENDOR_SUFFIX + #else + #define MOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING + #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */ + #else + #define MOUNT_CIFS_VENDOR_SUFFIX "" + #endif /* _SAMBA_BUILD_ */ +#endif /* MOUNT_CIFS_VENDOR_SUFFIX */ #ifndef MS_MOVE #define MS_MOVE 8192 diff --git a/source3/client/umount.cifs.c b/source3/client/umount.cifs.c index e6dd08dbf2..1c8dad045c 100644 --- a/source3/client/umount.cifs.c +++ b/source3/client/umount.cifs.c @@ -39,8 +39,17 @@ #define UNMOUNT_CIFS_VERSION_MINOR "5" #ifndef UNMOUNT_CIFS_VENDOR_SUFFIX -#define UNMOUNT_CIFS_VENDOR_SUFFIX "" -#endif + #ifdef _SAMBA_BUILD_ + #include "include/version.h" + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #define UNMOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING"-"SAMBA_VERSION_VENDOR_SUFFIX + #else + #define UNMOUNT_CIFS_VENDOR_SUFFIX "-"SAMBA_VERSION_OFFICIAL_STRING + #endif /* SAMBA_VERSION_OFFICIAL_STRING and SAMBA_VERSION_VENDOR_SUFFIX */ + #else + #define UNMOUNT_CIFS_VENDOR_SUFFIX "" + #endif /* _SAMBA_BUILD_ */ +#endif /* UNMOUNT_CIFS_VENDOR_SUFFIX */ #ifndef MNT_DETACH #define MNT_DETACH 0x02 |