/[monit]/monit/p.y
ViewVC logotype

Diff of /monit/p.y

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.64 by rory, Wed Jun 4 03:03:15 2003 UTC revision 1.65 by rory, Wed Jun 4 05:26:37 2003 UTC
# Line 1163  static void adduid(char *user, uid_t uid Line 1163  static void adduid(char *user, uid_t uid
1163    
1164    if(!getuid()) {    if(!getuid()) {
1165    
1166    #ifdef HAVE_GETPWNAM_R
1167      char buf[1024];      char buf[1024];
     struct passwd *r;  
1168      struct passwd pwd;      struct passwd pwd;
1169    #endif
1170        struct passwd *r;
1171    
1172      if(user) {      if(user) {
1173                
1174    #ifdef HAVE_GETPWNAM_R
1175        if((0 != getpwnam_r(user, &pwd, buf, 1024, &r)) || !r) {        if((0 != getpwnam_r(user, &pwd, buf, 1024, &r)) || !r) {
1176    #else
1177            r = getpwnam(user);
1178            if ( r == NULL ) {
1179    #endif
1180                    
1181         log("%s: Requested user '%s' not found on the system. Error at line %d\n",         log("%s: Requested user '%s' not found on the system. Error at line %d\n",
1182             prog, user, lineno);             prog, user, lineno);
# Line 1179  static void adduid(char *user, uid_t uid Line 1186  static void adduid(char *user, uid_t uid
1186                
1187      } else {      } else {
1188                
1189    #ifdef HAVE_GETPWUID_R
1190        if((0 != getpwuid_r(uid, &pwd, buf, 1024, &r)) || !r) {        if((0 != getpwuid_r(uid, &pwd, buf, 1024, &r)) || !r) {
1191    #else
1192          r = getpwuid(uid);
1193          if ( r == NULL ) {
1194    #endif    
1195                    
1196         log("%s: Requested uid '%d' not found on the system. Error at line %d\n",         log("%s: Requested uid '%d' not found on the system. Error at line %d\n",
1197             prog, uid, lineno);             prog, uid, lineno);
# Line 1216  static void adduid(char *user, uid_t uid Line 1228  static void adduid(char *user, uid_t uid
1228  static void addgid(char *group, gid_t gid) {  static void addgid(char *group, gid_t gid) {
1229    
1230    if(!getuid()) {    if(!getuid()) {
1231        
1232    #ifdef HAVE_GETGRNAM_R    
1233      char buf[1024];      char buf[1024];
     struct group *r;  
1234      struct group gwd;      struct group gwd;
1235    #endif
1236        struct group *r;
1237    
1238      if(group) {      if(group) {
1239                
1240    #ifdef HAVE_GETGRNAM_R
1241        if((0 != getgrnam_r(group, &gwd, buf, 1024, &r)) || !r) {        if((0 != getgrnam_r(group, &gwd, buf, 1024, &r)) || !r) {
1242    #else
1243          r = getgrnam(group);
1244          if ( r == NULL ) {
1245    #endif  
1246                    
1247        log("%s: Requested group '%s' not found on the system. Error at line %d\n",        log("%s: Requested group '%s' not found on the system. Error at line %d\n",
1248            prog, group, lineno);            prog, group, lineno);
# Line 1233  static void addgid(char *group, gid_t gi Line 1252  static void addgid(char *group, gid_t gi
1252                
1253      } else {      } else {
1254                    
1255    #ifdef HAVE_GETGRGID_R
1256        if((0 != getgrgid_r(gid, &gwd, buf, 1024, &r)) || !r) {        if((0 != getgrgid_r(gid, &gwd, buf, 1024, &r)) || !r) {
1257    #else
1258          r = getgrgid(gid);
1259          if ( r == NULL ) {
1260    #endif
1261                    
1262        log("%s: Requested gid '%d' not found on the system. Error at line %d\n",        log("%s: Requested gid '%d' not found on the system. Error at line %d\n",
1263            prog, gid, lineno);            prog, gid, lineno);

Legend:
Removed from v.1.64  
changed lines
  Added in v.1.65

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26