From 13748870c37929e60835a5affdf5ac405cb436d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Jacke?= Date: Tue, 6 Jun 2023 17:25:35 +0200 Subject: [PATCH] lib/util: move copyright define to copyright.h BUG: https://bugzilla.samba.org/show_bug.cgi?id=15377 Signed-off-by: Bjoern Jacke Reviewed-by: Andrew Bartlett (cherry picked from commit b7631bf603fbce9b80b19410f0680ce8c4170a1b) --- lib/util/copyright.h | 28 ++++++++++++++++++++++++++++ source3/include/includes.h | 3 +++ source3/include/smb.h | 3 --- source4/include/includes.h | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 lib/util/copyright.h diff --git a/lib/util/copyright.h b/lib/util/copyright.h new file mode 100644 index 00000000000..a29f2285d13 --- /dev/null +++ b/lib/util/copyright.h @@ -0,0 +1,28 @@ +/* + Unix SMB/CIFS implementation. + + Copyright (C) Björn Jacke 2023 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __LIB_UTIL_COPYRIGHT_H__ +#define __LIB_UTIL_COPYRIGHT_H__ + +/* logged when starting the various Samba daemons */ +#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2023" + +#endif /* __LIB_UTIL_COPYRIGHT_H__ */ + + diff --git a/source3/include/includes.h b/source3/include/includes.h index 02beb0a0c88..8bb6ee88803 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -242,6 +242,9 @@ enum timestamp_set_resolution { typedef char fstring[FSTRING_LEN]; #endif +/* copyright define */ +#include "../lib/util/copyright.h" + /* debug.h need to be included before samba_util.h for the macro SMB_ASSERT */ #include "../lib/util/debug.h" diff --git a/source3/include/smb.h b/source3/include/smb.h index 487a8b316d8..81d761d2280 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -29,9 +29,6 @@ #include "libcli/smb/smb_common.h" #include "libds/common/roles.h" -/* logged when starting the various Samba daemons */ -#define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2023" - #define LARGE_WRITEX_HDR_SIZE 65 #define LARGE_WRITEX_BUFFER_SIZE (128*1024) diff --git a/source4/include/includes.h b/source4/include/includes.h index e7abf1a2492..8832b97ed02 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -57,6 +57,9 @@ #endif #include "../lib/util/attr.h" +/* copyright define */ +#include "../lib/util/copyright.h" + /* debug.h need to be included before samba_util.h for the macro SMB_ASSERT */ #include "../lib/util/debug.h" #include "../lib/util/samba_util.h" -- 2.11.4.GIT