Changeset 523:0c640b607a7f in roaraudio

Timestamp:

08/16/08 00:26:43 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

it should now be possible to use --setuid/--setgid on non unix sockets

File:

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

roard/roard.c

@@ -311 +311 @@
   }
 
+  if ( (grp = getgrnam(sock_grp)) == NULL ) {
+   ROAR_ERR("Can not get GID for group %s: %s", sock_grp, strerror(errno));
+  }
+  if ( sock_user || (setids & R_SETUID) ) {
+   if ( (pwd = getpwnam(sock_user)) == NULL ) {
+    ROAR_ERR("Can not get UID for user %s: %s", sock_user, strerror(errno));
+   }
+  }
+
   if ( *server == '/' ) {
-   if ( sock_user ) {
-    if ( (pwd = getpwnam(sock_user)) == NULL ) {
-     ROAR_ERR("Can not get UID for user %s: %s", sock_user, strerror(errno));
-    }
-   }
-   if ( (grp = getgrnam(sock_grp)) == NULL ) {
-    ROAR_ERR("Can not get GID for group %s: %s", sock_grp, strerror(errno));
-   } else {
+   if ( grp ) {
     if ( pwd ) {
      chown(server, pwd->pw_uid, grp->gr_gid);
@@ -372 +374 @@
    ROAR_ERR("Can not clear supplementary group IDs: %s", strerror(errno));
   }
-  if ( setgid(grp->gr_gid) == -1 ) {
+  if ( !grp || setgid(grp->gr_gid) == -1 ) {
    ROAR_ERR("Can not set GroupID: %s", strerror(errno));
   }