Rename WBC_DOMAIN_XXX domain flags to WBC_DOMINFO_DOMAIN_XXX

Better consistency with the othre classes of WBC_DOMINDO_XXX_YYYY flags.

diff --git a/source/nsswitch/libwbclient/wbc_util.c b/source/nsswitch/libwbclient/wbc_util.c
index a1b6626bd35a1bb1808f023a985141453be5812d..c1b3affc721f79ad9f87cf7abe27ffd734d001a4 100644 (file)
--- a/source/nsswitch/libwbclient/wbc_util.c
+++ b/source/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/source/nsswitch/libwbclient/wbclient.h b/source/nsswitch/libwbclient/wbclient.h
index d73ea297a391002e8d86af16ea6a16b5ee9aece4..67fa25691ae347a69aece03d0b0ac754a67edc80 100644 (file)
--- a/source/nsswitch/libwbclient/wbclient.h
+++ b/source/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/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 8aa4e5f15f9f81b2c130bc7138e65810287b7ae3..d844e2385e55a3f9e215ed1f0f28a7ab6e749dcc 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/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);