From bb3dc274c59720dc1e231a536edf176cf9687b2e Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Sat, 12 Sep 2015 14:56:50 +0000
Subject: Wrap <unistd.h> so that internal calls go direct and they're all weak
 symbols Delete unused 'fd' argument from internal function oldttyname()

---
 src/lib/libc/crypt/crypt.c     | 4 +++-
 src/lib/libc/crypt/cryptutil.c | 4 +++-
 src/lib/libc/net/rcmd.c        | 1 +
 src/lib/libc/net/rcmdsh.c      | 3 ++-
 src/lib/libc/net/rresvport.c   | 3 ++-
 src/lib/libc/net/ruserok.c     | 1 +
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
index 95e69bbe99..40d5503544 100644
--- a/src/lib/libc/crypt/crypt.c
+++ b/src/lib/libc/crypt/crypt.c
@@ -1,7 +1,8 @@
-/*	$OpenBSD: crypt.c,v 1.30 2015/07/18 01:18:50 jeremy Exp $	*/
+/*	$OpenBSD: crypt.c,v 1.31 2015/09/12 14:56:50 guenther Exp $	*/
 
 #include <errno.h>
 #include <pwd.h>
+#include <unistd.h>
 
 char *
 crypt(const char *key, const char *setting)
@@ -18,3 +19,4 @@ crypt(const char *key, const char *setting)
 	errno = EINVAL;
 	return (NULL);
 }
+DEF_WEAK(crypt);
diff --git a/src/lib/libc/crypt/cryptutil.c b/src/lib/libc/crypt/cryptutil.c
index d750933ffb..20d68b3fd3 100644
--- a/src/lib/libc/crypt/cryptutil.c
+++ b/src/lib/libc/crypt/cryptutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptutil.c,v 1.10 2015/07/23 22:19:03 tedu Exp $ */
+/* $OpenBSD: cryptutil.c,v 1.11 2015/09/12 14:56:50 guenther Exp $ */
 /*
  * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
  *
@@ -50,6 +50,7 @@ fail:
 	errno = EACCES;
 	return -1;
 }
+DEF_WEAK(crypt_checkpass);
 
 int
 crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen)
@@ -95,3 +96,4 @@ crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen)
 err:
 	return rv;
 }
+DEF_WEAK(crypt_newhash);
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index 600565a235..bf68603649 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/lib/libc/net/rcmd.c
@@ -292,4 +292,5 @@ bad:
 	sigprocmask(SIG_SETMASK, &oldmask, NULL);
 	return (-1);
 }
+DEF_WEAK(rcmd_af);
 
diff --git a/src/lib/libc/net/rcmdsh.c b/src/lib/libc/net/rcmdsh.c
index ab86475c84..ad3f79ecc5 100644
--- a/src/lib/libc/net/rcmdsh.c
+++ b/src/lib/libc/net/rcmdsh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcmdsh.c,v 1.14 2015/03/23 22:29:32 halex Exp $	*/ 
+/*	$OpenBSD: rcmdsh.c,v 1.15 2015/09/12 14:56:50 guenther Exp $	*/ 
 
 /*
  * Copyright (c) 2001, MagniComp
@@ -181,3 +181,4 @@ rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser,
 	}
 	/* NOTREACHED */
 }
+DEF_WEAK(rcmdsh);
diff --git a/src/lib/libc/net/rresvport.c b/src/lib/libc/net/rresvport.c
index 2ecbc0a67d..6b45000f7b 100644
--- a/src/lib/libc/net/rresvport.c
+++ b/src/lib/libc/net/rresvport.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rresvport.c,v 1.10 2015/01/16 16:48:51 deraadt Exp $ */
+/* $OpenBSD: rresvport.c,v 1.11 2015/09/12 14:56:50 guenther Exp $ */
 /*
  * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
  * Copyright (c) 1983, 1993, 1994
@@ -104,3 +104,4 @@ rresvport_af(int *alport, int af)
 	*alport = ntohs(*portp);
 	return (s);
 }
+DEF_WEAK(rresvport_af);
diff --git a/src/lib/libc/net/ruserok.c b/src/lib/libc/net/ruserok.c
index eed76d97db..4e83b78bf6 100644
--- a/src/lib/libc/net/ruserok.c
+++ b/src/lib/libc/net/ruserok.c
@@ -174,6 +174,7 @@ again:
 	}
 	return (-1);
 }
+DEF_WEAK(iruserok_sa);
 
 /*
  * XXX
-- 
cgit v1.2.3-55-g6feb