diff options
| -rw-r--r-- | cifs.upcall.c | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | mount.cifs.c | 10 |
3 files changed, 5 insertions, 12 deletions
diff --git a/cifs.upcall.c b/cifs.upcall.c index 6d95477..a81eb24 100644 --- a/cifs.upcall.c +++ b/cifs.upcall.c @@ -53,7 +53,6 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k #define MAX_CCNAME_LEN PATH_MAX + 5 -const char *CIFSSPNEGO_VERSION = "1.4"; static const char *prog = "cifs.upcall"; typedef enum _sectype { NONE = 0, @@ -615,7 +614,7 @@ int main(const int argc, char *const argv[]) try_dns++; break; case 'v': - printf("version: %s\n", CIFSSPNEGO_VERSION); + printf("version: %s\n", VERSION); goto out; default: syslog(LOG_ERR, "unknown option: %c", c); diff --git a/configure.ac b/configure.ac index 4048549..6951ca4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,12 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([cifs-utils], [4.0], [jlayton@samba.org]) +AC_INIT([cifs-utils], [4.1rc1], [jlayton@samba.org], [cifs-utils], [http://samba.org/linux-cifs/cifs-utils/]) AC_CONFIG_SRCDIR([replace.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) -AM_INIT_AUTOMAKE([cifs-utils], [4.0]) +AM_INIT_AUTOMAKE # "with" options AC_ARG_ENABLE(cifsupcall, diff --git a/mount.cifs.c b/mount.cifs.c index 4e38415..d5f97db 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -43,9 +43,6 @@ #include "mount.h" #include "util.h" -#define MOUNT_CIFS_VERSION_MAJOR "1" -#define MOUNT_CIFS_VERSION_MINOR "14" - #ifndef MOUNT_CIFS_VENDOR_SUFFIX #ifdef _SAMBA_BUILD_ #include "version.h" @@ -1149,10 +1146,7 @@ uppercase_string(char *string) static void print_cifs_mount_version(void) { - printf("mount.cifs version: %s.%s%s\n", - MOUNT_CIFS_VERSION_MAJOR, - MOUNT_CIFS_VERSION_MINOR, - MOUNT_CIFS_VENDOR_SUFFIX); + printf("mount.cifs version: %s\n", VERSION); } /* @@ -1561,7 +1555,7 @@ mount_retry: } strlcat(options,",ver=",options_size); - strlcat(options,MOUNT_CIFS_VERSION_MAJOR,options_size); + strlcat(options,VERSION,options_size); if(orgoptions) { strlcat(options,",",options_size); |