4 files changed, 4 insertions, 4 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index f647a3ffaf..50abcc30c3 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -506,7 +506,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 
 		/* Assume "Domain Users" for the primary group */
 
-		sid_compose(&info->group_sid, &domain->sid, DOMAIN_GROUP_RID_USERS );
+		sid_compose(&info->group_sid, &domain->sid, DOMAIN_RID_USERS );
 
 		/* Try to fill in what the nss_info backend can do */
 
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 9554339769..34f1fbc341 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1039,7 +1039,7 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 			DEBUG(10,("winbindd_dual_pam_auth_cached: failed to get password properties.\n"));
 		}
 
-		if ((my_info3->base.rid != DOMAIN_USER_RID_ADMIN) ||
+		if ((my_info3->base.rid != DOMAIN_RID_ADMINISTRATOR) ||
 		    (password_properties & DOMAIN_PASSWORD_LOCKOUT_ADMINS)) {
 			my_info3->base.acct_flags |= ACB_AUTOLOCK;
 		}
diff --git a/source3/winbindd/winbindd_passdb.c b/source3/winbindd/winbindd_passdb.c
index 34b5990a3f..023f68f1b3 100644
--- a/source3/winbindd/winbindd_passdb.c
+++ b/source3/winbindd/winbindd_passdb.c
@@ -467,7 +467,7 @@ static NTSTATUS sam_query_user_list(struct winbindd_domain *domain,
 		   something like that. */
 
 		sid_compose(&(*info)[i].group_sid, &domain->sid,
-				DOMAIN_GROUP_RID_USERS);
+				DOMAIN_RID_USERS);
 	}
 
 	TALLOC_FREE(ps);
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 87494db2bb..793cc430f0 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -124,7 +124,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 			   something like that. */
 
 			sid_compose(&dst->group_sid, &domain->sid,
-				    DOMAIN_GROUP_RID_USERS);
+				    DOMAIN_RID_USERS);
 		}
 
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));