squash

arrowd · arrowd · commit 40cb29bd6ee2 · 2025-03-08T19:20:57.000+03:00
diff --git a/src/sss_client/common.c b/src/sss_client/common.c
@@ -1044,15 +1044,15 @@ static errno_t check_server_cred(int sockfd)
         return ESSS_BAD_CRED_MSG;
     }
 
-    if ((cli_creds_get_uid(&server_cred) == 0) && (cli_creds_get_gid(&server_cred) == 0)) {
+    if ((CRED_UID(&server_cred) == 0) && (CRED_GID(&server_cred) == 0)) {
         return 0;
     }
 
 #ifdef SSSD_NON_ROOT_USER
 #ifdef HAVE_PTHREAD_EXT
     pthread_once(&sss_sssd_ids_init, init_sssd_ids); /* once for all threads */
 
-    if ((cli_creds_get_uid(&server_cred) == sss_sssd_uid) && (cli_creds_get_gid(&server_cred) == sss_sssd_gid)) {
+    if ((CRED_UID(&server_cred) == sss_sssd_uid) && (CRED_GID(&server_cred) == sss_sssd_gid)) {
         return 0;
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1044,15 +1044,15 @@ static errno_t check_server_cred(int sockfd)`
`1044`	`1044`	`return ESSS_BAD_CRED_MSG;`
`1045`	`1045`	`}`
`1046`	`1046`
`1047`		`- if ((cli_creds_get_uid(&server_cred) == 0) && (cli_creds_get_gid(&server_cred) == 0)) {`
	`1047`	`+ if ((CRED_UID(&server_cred) == 0) && (CRED_GID(&server_cred) == 0)) {`
`1048`	`1048`	`return 0;`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`	`1051`	`#ifdef SSSD_NON_ROOT_USER`
`1052`	`1052`	`#ifdef HAVE_PTHREAD_EXT`
`1053`	`1053`	`pthread_once(&sss_sssd_ids_init, init_sssd_ids); /* once for all threads */`
`1054`	`1054`
`1055`		`- if ((cli_creds_get_uid(&server_cred) == sss_sssd_uid) && (cli_creds_get_gid(&server_cred) == sss_sssd_gid)) {`
	`1055`	`+ if ((CRED_UID(&server_cred) == sss_sssd_uid) && (CRED_GID(&server_cred) == sss_sssd_gid)) {`
`1056`	`1056`	`return 0;`
`1057`	`1057`	`}`
`1058`	`1058`	`#endif`