From: Volker Lendecke Date: Thu, 11 Jun 2020 12:48:48 +0000 (+0200) Subject: lib: Move a #define ip_equal_v4() to nmbd/nmbd.h X-Git-Tag: ldb-2.2.0~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e7ff44fd46f34e1df50bb7c55334b0ed5501d18;p=thirdparty%2Fsamba.git lib: Move a #define ip_equal_v4() to nmbd/nmbd.h It's only used there Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 90ec794a519..bf5c8b68d94 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -164,12 +164,6 @@ #define ENCRYPTION_REQUIRED(conn) ((conn) ? ((conn)->encrypt_level == SMB_SIGNING_REQUIRED) : false) #define IS_CONN_ENCRYPTED(conn) ((conn) ? (conn)->encrypted_tid : false) -/**************************************************************************** -true if two IPv4 addresses are equal -****************************************************************************/ - -#define ip_equal_v4(ip1,ip2) ((ip1).s_addr == (ip2).s_addr) - /***************************************************************** splits out the last subkey of a key *****************************************************************/ diff --git a/source3/nmbd/nmbd.h b/source3/nmbd/nmbd.h index 47940e19401..551868e29ad 100644 --- a/source3/nmbd/nmbd.h +++ b/source3/nmbd/nmbd.h @@ -28,4 +28,10 @@ #include "libsmb/nmblib.h" #include "nmbd/nmbd_proto.h" +/**************************************************************************** +true if two IPv4 addresses are equal +****************************************************************************/ + +#define ip_equal_v4(ip1,ip2) ((ip1).s_addr == (ip2).s_addr) + #endif /* _NMBD_NMBD_H_ */