Rename WBC_DOMAIN_XXX domain flags to WBC_DOMINFO_DOMAIN_XXX

Better consistency with the othre classes of WBC_DOMINDO_XXX_YYYY flags.
(cherry picked from commit 1cb2305fc96be0c190621f7c86c0476e4ea1fff7)

diff --git a/source/nsswitch/libwbclient/wbc_util.c b/source/nsswitch/libwbclient/wbc_util.c
index d7af4d1bf2cebc773e00336eecca40c7eaccabe0..7543f275d72de5502af00c77fa008cdcee25c48b 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 05cee9ab2b926f09bc58f133143ce732a6678191..9c7adf7ae72e18f235dced14df7f6c055a06c1d1 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 ed49be74316501ba11902c2173100eb646e40c24..19d06071798e71357b393527cca63b75595dea86 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);