diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-18 01:19:32 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-18 01:19:32 +0000 |
| commit | a491ec96fc9fa19a164febd45309a47504fddc16 (patch) | |
| tree | 667157b2a615c4f2c4978566be2291c4fed2a7ae /source3/lib/replace.c | |
| parent | 490439d77a7fe3daadce1f30f17f03896c6739aa (diff) | |
| download | samba-a491ec96fc9fa19a164febd45309a47504fddc16.tar.gz samba-a491ec96fc9fa19a164febd45309a47504fddc16.tar.bz2 samba-a491ec96fc9fa19a164febd45309a47504fddc16.zip | |
Fixed problem with HAVE_NETGROUP being used on platforms
that cannot support it.
Jeremy.
(This used to be commit 7a6f25ac4ab0f0bef7a66f26004c15120248ff66)
Diffstat (limited to 'source3/lib/replace.c')
| -rw-r--r-- | source3/lib/replace.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/source3/lib/replace.c b/source3/lib/replace.c index b0adb72fd2..2d4ed775a4 100644 --- a/source3/lib/replace.c +++ b/source3/lib/replace.c @@ -41,7 +41,7 @@ ftruncate for operating systems that don't have it fl.l_type = F_WRLCK; return fcntl(f, F_FREESP, &fl); } -#endif +#endif /* HAVE_FTRUNCATE */ #ifndef HAVE_MKTIME @@ -119,10 +119,11 @@ Corrections by richard.kettlewell@kewill.com } return unlink (zfrom); } -#endif +#endif /* HAVE_RENAME */ #ifndef HAVE_INNETGR +#if defined(HAVE_SETNETGRENT) && defined(HAVE_GETNETGRENT) && defined(HAVE_ENDNETGRENT) /* * Search for a match in a netgroup. This replaces it on broken systems. */ @@ -142,7 +143,8 @@ Corrections by richard.kettlewell@kewill.com endnetgrent(); return (0); } -#endif +#endif /* HAVE_SETNETGRENT HAVE_GETNETGRENT HAVE_ENDNETGRENT */ +#endif /* HAVE_INNETGR */ @@ -160,7 +162,7 @@ Corrections by richard.kettlewell@kewill.com } /* yikes! no SETGROUPS or INITGROUPS? how can this work? */ return(0); -#else +#else /* HAVE_SETGROUPS */ gid_t grouplst[NGROUPS_MAX]; int i,j; struct group *g; @@ -186,9 +188,9 @@ Corrections by richard.kettlewell@kewill.com } endgrent(); return(setgroups(i,grouplst)); -#endif +#endif /* HAVE_SETGROUPS */ } -#endif +#endif /* HAVE_INITGROUPS */ #if (defined(SecureWare) && defined(SCO)) @@ -260,7 +262,7 @@ needs. } return(dest); } -#endif +#endif /* HAVE_MEMMOVE */ #ifndef HAVE_STRDUP /**************************************************************************** @@ -268,7 +270,7 @@ duplicate a string ****************************************************************************/ char *strdup(const char *s) { - int len; + size_t len; char *ret; if (!s) return(NULL); @@ -279,7 +281,7 @@ duplicate a string memcpy(ret,s,len); return(ret); } -#endif +#endif /* HAVE_STRDUP */ #ifdef REPLACE_INET_NTOA char *rep_inet_ntoa(struct in_addr ip) @@ -289,11 +291,11 @@ char *rep_inet_ntoa(struct in_addr ip) #if WORDS_BIGENDIAN slprintf(buf, 17, "%d.%d.%d.%d", (int)p[0], (int)p[1], (int)p[2], (int)p[3]); -#else +#else /* WORDS_BIGENDIAN */ slprintf(buf, 17, "%d.%d.%d.%d", (int)p[3], (int)p[2], (int)p[1], (int)p[0]); -#endif +#endif /* WORDS_BIGENDIAN */ return buf; } -#endif +#endif /* REPLACE_INET_NTOA */ |