fix: 1. return 01 --> return -1 (it's meant to be an error return val)

	2. uid_str --> gid_str  (orelse it's checking the same condition twice)
	3. uid_str --> gid_str typo (orelse it's running a gid function on a uid_str)
(fix(sem): octal return value, wrong NULL check variable, and wrong gid_t type in header 168)

diff --git a/src/lib/util/sem.c b/src/lib/util/sem.c
index 89fd1a4d1737162d8fcbb18cb4b6085ccec99461..65473d9b899290d05c6c84d3d8e4eb6ad190065e 100644 (file)
--- a/src/lib/util/sem.c
+++ b/src/lib/util/sem.c
@@ -188,7 +188,7 @@ int fr_sem_post(int sem_id, char const *file, bool undo_on_exit)
        if (errno != 0) {
                fr_strerror_printf("Failed getting value from semaphore bound to \"%s\" - %s", file,
                                   fr_syserror(errno));
-               return 01;
+               return -1;
        }
        if (num == 0) return 1;
 
@@ -299,7 +299,7 @@ int fr_sem_wait(int sem_id, char const *file, bool undo_on_exit, bool nonblock)
                if (unlikely(!uid_str)) goto simple_error;
 
                gid_str = fr_perm_gid_to_str(NULL, gid);
-               if (unlikely(!uid_str)) {
+               if (unlikely(!gid_str)) {
                        talloc_free(uid_str);
                        goto simple_error;
                }

diff --git a/src/lib/util/sem.h b/src/lib/util/sem.h
index a89712d8ca126423874ad3b0b2b6e1d4bbfd35ae..e0ed79e820bba9255dab942997c85ffb20523764 100644 (file)
--- a/src/lib/util/sem.h
+++ b/src/lib/util/sem.h
@@ -35,7 +35,7 @@ int   fr_sem_pid(pid_t *pid, int sem_id);
 
 int    fr_sem_uid(uid_t *uid, int sem_id);
 
-int    fr_sem_gid(uid_t *gid, int sem_id);
+int    fr_sem_gid(gid_t *gid, int sem_id);
 
 int    fr_sem_cuid(uid_t *uid, int sem_id);