diff options
| author | Christian Ambach <ambi@samba.org> | 2012-08-03 17:59:17 +0200 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2012-08-06 18:07:52 +0200 |
| commit | 18c152f8aa5ab7b5463fa1f6daf72fbbe32eaddb (patch) | |
| tree | 336fbe8e2b7fab78c267963875702b7134c10ef4 | |
| parent | efe28b124770eaa66e39b1e9c717358d53547bd5 (diff) | |
| download | samba-18c152f8aa5ab7b5463fa1f6daf72fbbe32eaddb.tar.gz samba-18c152f8aa5ab7b5463fa1f6daf72fbbe32eaddb.tar.bz2 samba-18c152f8aa5ab7b5463fa1f6daf72fbbe32eaddb.zip | |
lib/param: move enum dns_update_settings to lib/param
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 3 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 | ||||
| -rw-r--r-- | source4/dns_server/dns_update.c | 2 | ||||
| -rw-r--r-- | source4/dns_server/dns_update.h | 25 |
5 files changed, 4 insertions, 28 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 80733b4e29..4751a06198 100644 --- 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 8c4a7b172f..591e6e5dbe 100644 --- 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 dc23868a99..1b766c3c46 100644 --- 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 a09818d70a..e7514acace 100644 --- 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 index 71ff85eda1..0000000000 --- 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 -}; |