lib/param: move enum dns_update_settings to lib/param

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 80733b4e29a4875e6d34f7408f492530bdd3a268..4751a06198a6173d3338e1700f1feb3bdc09c16e 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -66,7 +66,6 @@
 #include "lib/param/s3_param.h"
 #include "lib/util/bitmap.h"
 #include "libcli/smb/smb_constants.h"
-#include "source4/dns_server/dns_update.h"
 
 #define standard_sub_basic talloc_strdup
 

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 8c4a7b172f600da9d106169a230dfdf926f74c10..591e6e5dbe12435002faa0ffdd6412b4c5f95bb7 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -176,6 +176,9 @@ enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
 #define ADS_AUTH_SASL_FORCE       0x0080
 #define ADS_AUTH_USER_CREDS       0x0100
 
+/* DNS update settings */
+enum dns_update_settings {DNS_UPDATE_OFF, DNS_UPDATE_ON, DNS_UPDATE_SIGNED};
+
 /* LDAP SSL options */
 enum ldap_ssl_types {LDAP_SSL_OFF, LDAP_SSL_START_TLS};
 

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index dc23868a999c04aef8912964614f830889c117ba..1b766c3c468d7049c7dee601bf9eb0e8f47609b2 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -68,7 +68,6 @@
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "../lib/util/bitmap.h"
-#include "../source4/dns_server/dns_update.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index a09818d70a2abd8259f871a7febabf0720420183..e7514acace0268377934c0343b8c5a58f5875b5e 100644 (file)
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -26,11 +26,11 @@
 #include "librpc/gen_ndr/ndr_dnsp.h"
 #include <ldb.h>
 #include "param/param.h"
+#include "param/loadparm.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/util.h"
 #include "smbd/service_task.h"
 #include "dns_server/dns_server.h"
-#include "dns_server/dns_update.h"
 
 static WERROR dns_rr_to_dnsp(TALLOC_CTX *mem_ctx,
                             const struct dns_res_rec *rrec,

diff --git a/source4/dns_server/dns_update.h b/source4/dns_server/dns_update.h
deleted file mode 100644 (file)
index 71ff85e..0000000
--- a/source4/dns_server/dns_update.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   DNS update settings
-
-   Copyright (C) 2011 Kai Blin  <kai@samba.org>
-
-   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 <http://www.gnu.org/licenses/>.
-*/
-enum dns_update_settings {
-       DNS_UPDATE_OFF=0,
-       DNS_UPDATE_ON=1,
-       DNS_UPDATE_SIGNED=2
-};