diff options
| author | Pavel Reichl <preichl@redhat.com> | 2014-06-10 18:14:45 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-06-18 14:41:38 +0200 |
| commit | edf96099f719e591e98be20af416a32cb4aeea73 (patch) | |
| tree | 5fe4e3cf7a482ffce0ccdd186ede0ab4a5fa57e7 /src/providers/ad | |
| parent | c9f94bc64ed7dfbaef5a520bfc4e911c5d0ad6fe (diff) | |
| download | sssd-edf96099f719e591e98be20af416a32cb4aeea73.tar.gz sssd-edf96099f719e591e98be20af416a32cb4aeea73.tar.xz sssd-edf96099f719e591e98be20af416a32cb4aeea73.zip | |
AD: cleanup redundant #define statements
Resolves:
https://fedorahosted.org/sssd/ticket/2185
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src/providers/ad')
| -rw-r--r-- | src/providers/ad/ad_common.h | 7 | ||||
| -rw-r--r-- | src/providers/ad/ad_domain_info.c | 8 | ||||
| -rw-r--r-- | src/providers/ad/ad_srv.c | 4 | ||||
| -rw-r--r-- | src/providers/ad/ad_subdomains.c | 9 |
4 files changed, 11 insertions, 17 deletions
diff --git a/src/providers/ad/ad_common.h b/src/providers/ad/ad_common.h index 84c4593c6..b2949c37f 100644 --- a/src/providers/ad/ad_common.h +++ b/src/providers/ad/ad_common.h @@ -31,6 +31,13 @@ /* The port the Global Catalog runs on */ #define AD_GC_PORT 3268 +#define AD_AT_OBJECT_SID "objectSID" +#define AD_AT_DNS_DOMAIN "DnsDomain" +#define AD_AT_NT_VERSION "NtVer" +#define AD_AT_NETLOGON "netlogon" + +#define MASTER_DOMAIN_SID_FILTER "objectclass=domain" + struct ad_options; enum ad_basic_opt { diff --git a/src/providers/ad/ad_domain_info.c b/src/providers/ad/ad_domain_info.c index a71323849..70e3a2875 100644 --- a/src/providers/ad/ad_domain_info.c +++ b/src/providers/ad/ad_domain_info.c @@ -32,15 +32,9 @@ #include "providers/ldap/sdap_async.h" #include "providers/ldap/sdap_idmap.h" #include "providers/ad/ad_domain_info.h" +#include "providers/ad/ad_common.h" #include "util/util.h" -#define AD_AT_OBJECT_SID "objectSID" -#define AD_AT_DNS_DOMAIN "DnsDomain" -#define AD_AT_NT_VERSION "NtVer" -#define AD_AT_NETLOGON "netlogon" - -#define MASTER_DOMAIN_SID_FILTER "objectclass=domain" - static errno_t netlogon_get_domain_info(TALLOC_CTX *mem_ctx, struct sysdb_attrs *reply, diff --git a/src/providers/ad/ad_srv.c b/src/providers/ad/ad_srv.c index 8c0788bee..53d8a8770 100644 --- a/src/providers/ad/ad_srv.c +++ b/src/providers/ad/ad_srv.c @@ -29,15 +29,13 @@ #include "resolv/async_resolv.h" #include "providers/dp_backend.h" #include "providers/ad/ad_srv.h" +#include "providers/ad/ad_common.h" #include "providers/fail_over.h" #include "providers/fail_over_srv.h" #include "providers/ldap/sdap.h" #include "providers/ldap/sdap_async.h" #define AD_SITE_DOMAIN_FMT "%s._sites.%s" -#define AD_AT_DNS_DOMAIN "DnsDomain" -#define AD_AT_NT_VERSION "NtVer" -#define AD_AT_NETLOGON "netlogon" static errno_t ad_sort_servers_by_dns(TALLOC_CTX *mem_ctx, const char *domain, diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index 3ba1059c1..efe4b3fe1 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -26,17 +26,14 @@ #include "providers/ad/ad_subdomains.h" #include "providers/ad/ad_domain_info.h" #include "providers/ad/ad_srv.h" +#include "providers/ad/ad_common.h" + #include "providers/ldap/sdap_idmap.h" #include "util/util_sss_idmap.h" #include <ctype.h> #include <ndr.h> #include <ndr/ndr_nbt.h> -#define AD_AT_OBJECT_SID "objectSID" -#define AD_AT_DNS_DOMAIN "DnsDomain" -#define AD_AT_NT_VERSION "NtVer" -#define AD_AT_NETLOGON "netlogon" - /* Attributes of AD trusted domains */ #define AD_AT_FLATNAME "flatName" #define AD_AT_SID "securityIdentifier" @@ -44,8 +41,6 @@ #define AD_AT_TRUST_PARTNER "trustPartner" #define AD_AT_TRUST_ATTRS "trustAttributes" -#define MASTER_DOMAIN_SID_FILTER "objectclass=domain" - /* trustType=2 denotes uplevel (NT5 and later) trusted domains. See * http://msdn.microsoft.com/en-us/library/windows/desktop/ms680342%28v=vs.85%29.aspx * for example. |