From 1006c89e1b71b9b9d2c8453e07fd19b223e95415 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Mon, 27 Feb 2006 14:18:52 +0000 Subject: 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) --- source3/client/umount.cifs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'source3/client/umount.cifs.c') 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 -- cgit