Move source3/lib/access.c to toplevel lib/util/access.c

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12419

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/lib/access.c b/lib/util/access.c
similarity index 98%
rename from source3/lib/access.c
rename to lib/util/access.c
index b7f58448ca0b4cd3e778e4092809a2a1a3292881..35c4920030ab46a9962482b92ecfb0a37c6e925f 100644 (file)
--- a/source3/lib/access.c
+++ b/lib/util/access.c
@@ -14,6 +14,11 @@
 #include "../lib/util/memcache.h"
 #include "lib/socket/interfaces.h"
 #include "lib/util/samba_util.h"
+#include "lib/util/util_net.h"
+#include "lib/util/samba_util.h"
+#include "lib/util/memory.h"
+#include "lib/util/access.h"
+#include "lib/util/unix_match.h"
 
 #define NAME_INDEX 0
 #define ADDR_INDEX 1

diff --git a/lib/util/access.h b/lib/util/access.h
new file mode 100644 (file)
index 0000000..b4dce15
--- /dev/null
+++ b/lib/util/access.h
@@ -0,0 +1,24 @@
+/*
+   This module is an adaption of code from the tcpd-1.4 package written
+   by Wietse Venema, Eindhoven University of Technology, The Netherlands.
+
+   The code is used here with permission.
+
+   The code has been considerably changed from the original. Bug reports
+   should be sent to samba-technical@lists.samba.org
+
+   Updated for IPv6 by Jeremy Allison (C) 2007.
+*/
+
+#ifndef _UTIL_ACCESS_H_
+#define _UTIL_ACCESS_H_
+
+bool client_match(const char *tok, const void *item);
+bool list_match(const char **list,const void *item,
+               bool (*match_fn)(const char *, const void *));
+bool allow_access(const char **deny_list,
+               const char **allow_list,
+               const char *cname,
+               const char *caddr);
+
+#endif

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index e2ae4110647d3546d03dc5f8ed76d2c5c64d105f..9b51f0e49737151de9472a59e4fb07147afb829e 100755 (executable)
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -199,3 +199,8 @@ else:
                       deps='talloc tdb strv util_tdb tdb-wrap samba-util',
                       local_include=False,
                       private_library=True)
+
+    bld.SAMBA_SUBSYSTEM('access',
+                        source='access.c',
+                        deps='interfaces samba-util',
+                        local_include=False)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2758dc5a47b60a3515cf500919af23ee222e57ad..33e3f6c24f1f119fa77e0ff6e932afcd823a4e5e 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -26,15 +26,7 @@
 #include <sys/types.h>
 #include <regex.h>
 
-/* The following definitions come from lib/access.c  */
-
-bool client_match(const char *tok, const void *item);
-bool list_match(const char **list,const void *item,
-               bool (*match_fn)(const char *, const void *));
-bool allow_access(const char **deny_list,
-               const char **allow_list,
-               const char *cname,
-               const char *caddr);
+#include "lib/util/access.h"
 
 /* The following definitions come from lib/adt_tree.c  */
 

diff --git a/source3/wscript_build b/source3/wscript_build
index 22e1a6297c10b40e45bd97d860dc6bc9f120b885..d6d2be2bbc1e25cae33baba351bf42c40444bd7e 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -334,7 +334,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                    lib/dumpcore.c
                    lib/interface.c
                    lib/username.c
-                   lib/access.c lib/smbrun.c
+                   lib/smbrun.c
                    lib/wins_srv.c
                    lib/substitute.c
                    lib/substitute_generic.c
@@ -374,6 +374,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         messages_util
                         messages_dgm
                         talloc_report
+                       access
                         TDB_LIB''')
 
 bld.SAMBA3_LIBRARY('smbd_shim',