j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Porting to SunOS 5.8:

Browse source 
- More #includes Linux doesn't seem to need
- Don't do unsetenv() on SunOS
- Use a replacement asprintf() in case the OS doesn't support it
It now compiles properly under SunOS.
This commit is contained in:
Guus Sliepen 2000-11-08 00:10:50 +00:00
parent 56bd0864e4
commit f8f1007bf4
4 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.68 2000/11/07 21:43:28 guus Exp $
$Id: net.c,v 1.35.4.69 2000/11/08 00:10:49 guus Exp $
*/
#include "config.h"
@ -25,7 +25,8 @@
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/sockios.h>
/* SunOS really wants sys/socket.h BEFORE net/if.h */
#include <sys/socket.h>
#include <net/if.h>
#include <netdb.h>
#include <netinet/in.h>
@ -33,7 +34,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <syslog.h>
@ -106,10 +106,12 @@ int execute_script(const char *name)
asprintf(&s, "NETNAME=%s", netname);
putenv(s); /* Don't free s! see man 3 putenv */
}
#ifdef HAVE_UNSETENV
else
{
unsetenv("NETNAME");
}
#endif
chdir(confbase); /* This cannot fail since we already read config files from this directory. */

3
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.24 2000/11/03 22:31:55 zarq Exp $
$Id: tincd.c,v 1.10.4.25 2000/11/08 00:10:50 guus Exp $
*/
#include "config.h"
@ -35,6 +35,7 @@
#include <openssl/rsa.h>
#include <openssl/err.h>
#include <string.h>
#include <termios.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>