diff options
| -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 |