summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorGerald W. Carter <jerry@samba.org>2008-04-22 12:22:59 -0500
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:50 -0500
commit5984097e0921996aacad0d6077e7f866f74d8c23 (patch)
treed63a2e1ec67fada7999668c27635ed7ad89560e5 /source3/nsswitch
parent9670e9e9b33ae0ef36d24afcaae95db43a6c5036 (diff)
downloadsamba-5984097e0921996aacad0d6077e7f866f74d8c23.tar.gz
samba-5984097e0921996aacad0d6077e7f866f74d8c23.tar.bz2
samba-5984097e0921996aacad0d6077e7f866f74d8c23.zip
Rename WBC_DOMAIN_XXX domain flags to WBC_DOMINFO_DOMAIN_XXX
Better consistency with the othre classes of WBC_DOMINDO_XXX_YYYY flags. (This used to be commit 1cb2305fc96be0c190621f7c86c0476e4ea1fff7)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/libwbclient/wbc_util.c6
-rw-r--r--source3/nsswitch/libwbclient/wbclient.h8
-rw-r--r--source3/nsswitch/wbinfo.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/source3/nsswitch/libwbclient/wbc_util.c b/source3/nsswitch/libwbclient/wbc_util.c
index a1b6626bd3..c1b3affc72 100644
--- a/source3/nsswitch/libwbclient/wbc_util.c
+++ b/source3/nsswitch/libwbclient/wbc_util.c
@@ -170,11 +170,11 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
BAIL_ON_WBC_ERROR(wbc_status);
if (response.data.domain_info.native_mode)
- info->domain_flags |= WBC_DOMINFO_NATIVE;
+ info->domain_flags |= WBC_DOMINFO_DOMAIN_NATIVE;
if (response.data.domain_info.active_directory)
- info->domain_flags |= WBC_DOMINFO_AD;
+ info->domain_flags |= WBC_DOMINFO_DOMAIN_AD;
if (response.data.domain_info.primary)
- info->domain_flags |= WBC_DOMINFO_PRIMARY;
+ info->domain_flags |= WBC_DOMINFO_DOMAIN_PRIMARY;
*dinfo = info;
diff --git a/source3/nsswitch/libwbclient/wbclient.h b/source3/nsswitch/libwbclient/wbclient.h
index d73ea297a3..67fa25691a 100644
--- a/source3/nsswitch/libwbclient/wbclient.h
+++ b/source3/nsswitch/libwbclient/wbclient.h
@@ -135,10 +135,10 @@ struct wbcDomainInfo {
/* wbcDomainInfo->domain_flags */
-#define WBC_DOMINFO_UNKNOWN 0x00000000
-#define WBC_DOMINFO_NATIVE 0x00000001
-#define WBC_DOMINFO_AD 0x00000002
-#define WBC_DOMINFO_PRIMARY 0x00000004
+#define WBC_DOMINFO_DOMAIN_UNKNOWN 0x00000000
+#define WBC_DOMINFO_DOMAIN_NATIVE 0x00000001
+#define WBC_DOMINFO_DOMAIN_AD 0x00000002
+#define WBC_DOMINFO_DOMAIN_PRIMARY 0x00000004
/* wbcDomainInfo->trust_flags */
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 8aa4e5f15f..d844e2385e 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -485,12 +485,12 @@ static bool wbinfo_domain_info(const char *domain)
d_printf("SID : %s\n", sid_str);
d_printf("Active Directory : %s\n",
- (dinfo->domain_flags & WBC_DOMINFO_AD) ? "Yes" : "No");
+ (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_AD) ? "Yes" : "No");
d_printf("Native : %s\n",
- (dinfo->domain_flags & WBC_DOMINFO_NATIVE) ? "Yes" : "No");
+ (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_NATIVE) ? "Yes" : "No");
d_printf("Primary : %s\n",
- (dinfo->domain_flags & WBC_DOMINFO_PRIMARY) ? "Yes" : "No");
+ (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_PRIMARY) ? "Yes" : "No");
wbcFreeMemory(sid_str);
wbcFreeMemory(dinfo);