Changeset 2753:4ba2efb7920b in roaraudio

Timestamp:

09/22/09 22:40:22 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make add_listen() independed of audio group

File:

• roard/roard.c (modified) (2 diffs)

roard/roard.c

@@ -322 +322 @@
 
 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX)
-  if ( (grp = getgrnam(group)) == NULL ) {
-   ROAR_ERR("Can not get GID for group %s: %s", group, strerror(errno));
+  if ( group != NULL ) {
+   if ( (grp = getgrnam(group)) == NULL ) {
+    ROAR_ERR("Can not get GID for group %s: %s", group, strerror(errno));
+   }
   }
 #endif
@@ -336 +338 @@
 #if defined(ROAR_HAVE_IO_POSIX) && defined(ROAR_HAVE_UNIX)
   if ( *addr == '/' ) {
+   if ( grp || pwd ) {
+     if ( chown(addr, pwd ? pwd->pw_uid : -1, grp ? grp->gr_gid : -1) == -1 )
+      return 1;
+   }
+#ifdef ROAR_HAVE_GETUID
    if ( grp ) {
-    if ( pwd ) {
-     if ( chown(addr, pwd->pw_uid, grp->gr_gid) == -1 )
-      return 1;
-    } else {
-     if ( chown(addr, -1, grp->gr_gid) == -1 )
-      return 1;
-    }
-#ifdef ROAR_HAVE_GETUID
     if ( getuid() == 0 )
      if ( chmod(addr, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) == -1 )
       return 1;
-#endif
-   }
+   }
+#endif
   }
 #endif