summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-22 13:00:22 +0100
committerVolker Lendecke <vl@samba.org>2008-01-22 13:00:22 +0100
commitd4d962f691d13f36226157c38f706ee4d10b9150 (patch)
treefd16aff827aa986e6bda46d5fd5c7e15fea77888 /source3
parent1d99598ca3f21dd863c8d63698f8af2b3b77759b (diff)
downloadsamba-d4d962f691d13f36226157c38f706ee4d10b9150.tar.gz
samba-d4d962f691d13f36226157c38f706ee4d10b9150.tar.bz2
samba-d4d962f691d13f36226157c38f706ee4d10b9150.zip
Move samba_extended_info_version to smbd/trans2.c
This is right now only used there, and in version.c it gave linker errors because some binaries (e.g. smbmnt) don't link in time.o (This used to be commit 1f0eaaa5911f893c822465a26fe49ab65afb0730)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/smb.h1
-rw-r--r--source3/lib/version.c32
-rw-r--r--source3/smbd/trans2.c32
3 files changed, 32 insertions, 33 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c859200462..f3cf1db6f8 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1946,6 +1946,5 @@ struct smb_extended_info {
NTTIME samba_gitcommitdate;
char samba_version_string[SAMBA_EXTENDED_INFO_VERSION_STRING_LENGTH];
};
-extern void samba_extended_info_version(struct smb_extended_info *);
#endif /* _SMB_H */
diff --git a/source3/lib/version.c b/source3/lib/version.c
index dff45f6259..3cae02ad2e 100644
--- a/source3/lib/version.c
+++ b/source3/lib/version.c
@@ -59,35 +59,3 @@ const char *samba_version_string(void)
return samba_version;
#endif
}
-
-void samba_extended_info_version(struct smb_extended_info *extended_info)
-{
- assert(extended_info != NULL);
-
- extended_info->samba_magic = SAMBA_EXTENDED_INFO_MAGIC;
- extended_info->samba_version = ((SAMBA_VERSION_MAJOR & 0xff) << 24)
- | ((SAMBA_VERSION_MINOR & 0xff) << 16)
- | ((SAMBA_VERSION_RELEASE & 0xff) << 8);
-#ifdef SAMBA_VERSION_REVISION
- extended_info->samba_version |= (tolower(*SAMBA_VERSION_REVISION) - 'a' + 1) & 0xff;
-#endif
-#ifdef SAMBA_VERSION_RC_RELEASE
- extended_info->samba_subversion |= (SAMBA_VERSION_RC_RELEASE & 0xff) << 24;
-#else
-#ifdef SAMBA_VERSION_PRE_RELEASE
- extended_info->samba_subversion |= (SAMBA_VERSION_PRE_RELEASE & 0xff) << 16;
-#endif
-#endif
-#ifdef SAMBA_VERSION_VENDOR_PATCH
- extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff);
-#endif
- /* FIXME: samba_gitcommitdate should contain the git commit date. */
- unix_to_nt_time(&extended_info->samba_gitcommitdate, time(NULL));
-
- memset(extended_info->samba_version_string, 0,
- sizeof(extended_info->samba_version_string));
-
- snprintf (extended_info->samba_version_string,
- sizeof(extended_info->samba_version_string),
- "%s", samba_version_string());
-}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 1243bdd9d2..8b999cd8f5 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2459,6 +2459,38 @@ unsigned char *create_volume_objectid(connection_struct *conn, unsigned char obj
return objid;
}
+static void samba_extended_info_version(struct smb_extended_info *extended_info)
+{
+ SMB_ASSERT(extended_info != NULL);
+
+ extended_info->samba_magic = SAMBA_EXTENDED_INFO_MAGIC;
+ extended_info->samba_version = ((SAMBA_VERSION_MAJOR & 0xff) << 24)
+ | ((SAMBA_VERSION_MINOR & 0xff) << 16)
+ | ((SAMBA_VERSION_RELEASE & 0xff) << 8);
+#ifdef SAMBA_VERSION_REVISION
+ extended_info->samba_version |= (tolower(*SAMBA_VERSION_REVISION) - 'a' + 1) & 0xff;
+#endif
+#ifdef SAMBA_VERSION_RC_RELEASE
+ extended_info->samba_subversion |= (SAMBA_VERSION_RC_RELEASE & 0xff) << 24;
+#else
+#ifdef SAMBA_VERSION_PRE_RELEASE
+ extended_info->samba_subversion |= (SAMBA_VERSION_PRE_RELEASE & 0xff) << 16;
+#endif
+#endif
+#ifdef SAMBA_VERSION_VENDOR_PATCH
+ extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff);
+#endif
+ /* FIXME: samba_gitcommitdate should contain the git commit date. */
+ unix_to_nt_time(&extended_info->samba_gitcommitdate, time(NULL));
+
+ memset(extended_info->samba_version_string, 0,
+ sizeof(extended_info->samba_version_string));
+
+ snprintf (extended_info->samba_version_string,
+ sizeof(extended_info->samba_version_string),
+ "%s", samba_version_string());
+}
+
/****************************************************************************
Reply to a TRANS2_QFSINFO (query filesystem info).
****************************************************************************/