Changeset 2820:258dc8b97e33 in roaraudio


Ignore:
Timestamp:
09/30/09 14:28:29 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

change deps on SO_PEERCRED and ROAR_HAVE_GETPEEREID

File:
1 edited

Legend:

Unmodified
Added
Removed
  • roard/network.c

    r2815 r2820  
    8282 int fh; 
    8383 int client; 
    84 #if defined(SO_PEERCRED) || defined(ROAR_HAVE_GETPEEREID) 
    8584 struct roar_client * c; 
    86 #endif 
    8785#ifdef SO_PEERCRED 
    8886 struct ucred cred; 
     
    109107 } 
    110108 
     109 if ( clients_get(client, &c) != -1 ) { 
    111110#ifdef SO_PEERCRED 
    112  if ( clients_get(client, &c) != -1 ) { 
    113111  if (getsockopt(fh, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len) != -1) { 
    114112   if ( cred.pid != 0 ) { 
     
    120118   ROAR_DBG("req_on_identify(): Can't get creds via SO_PEERCRED: %s", strerror(errno)); 
    121119  } 
    122  } 
    123120#elif defined(ROAR_HAVE_GETPEEREID) 
    124  if ( clients_get(client, &c) != -1 ) { 
    125121  if (getpeereid(fh, &(c->uid), &(c->gid)) == -1) { 
    126122   ROAR_DBG("req_on_identify(): Can't get creds via getpeereid(): %s", strerror(errno)); 
    127123  } 
    128  } 
    129124#endif 
    130125 
    131  if ( roar_nnode_free(&(c->nnode)) == -1 ) 
    132   return -1; 
     126  if ( roar_nnode_free(&(c->nnode)) == -1 ) 
     127   return -1; 
    133128 
    134  if ( roar_nnode_new_from_sockaddr(&(c->nnode), (struct sockaddr*)&addr, addrlen) == -1 ) 
    135   return -1; 
     129  if ( roar_nnode_new_from_sockaddr(&(c->nnode), (struct sockaddr*)&addr, addrlen) == -1 ) 
     130   return -1; 
     131 } 
    136132 
    137133 ROAR_DBG("net_get_new_client(*): proto=0x%.4x", proto); 
Note: See TracChangeset for help on using the changeset viewer.