about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-08-26 15:04:02 -0700
committerRoland McGrath <roland@hack.frob.com>2013-08-26 15:04:02 -0700
commit59d112a4c7b6bd3ab220abbb68d8127f316a109c (patch)
tree32d813cc9ef515949cf2dd8d0864d870de17c2ad
parent595aba70a4c676f7efaf6a012f54cd22aa189c5b (diff)
downloadglibc-59d112a4c7b6bd3ab220abbb68d8127f316a109c.tar.gz
glibc-59d112a4c7b6bd3ab220abbb68d8127f316a109c.tar.xz
glibc-59d112a4c7b6bd3ab220abbb68d8127f316a109c.zip
Use proper #include for xdecrypt declarations.
-rw-r--r--ChangeLog6
-rw-r--r--nis/nss_nis/nis-publickey.c2
-rw-r--r--nss/nss_files/files-key.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cde901094..2000233eb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-26  Roland McGrath  <roland@hack.frob.com>
+
+	* nss/nss_files/files-key.c: Include <rpc/des_crypt.h>
+	instead of explicitly declaring xdecrypt.
+	* nis/nss_nis/nis-publickey.c: Likewise.
+
 2013-08-26  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	[BZ #15890]
diff --git a/nis/nss_nis/nis-publickey.c b/nis/nss_nis/nis-publickey.c
index 6870e095c6..244e464978 100644
--- a/nis/nss_nis/nis-publickey.c
+++ b/nis/nss_nis/nis-publickey.c
@@ -25,7 +25,7 @@
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 #include <rpc/key_prot.h>
-extern int xdecrypt (char *, char *);
+#include <rpc/des_crypt.h>
 
 #include "nss-nis.h"
 
diff --git a/nss/nss_files/files-key.c b/nss/nss_files/files-key.c
index 96deac2311..4b2cf24ea6 100644
--- a/nss/nss_files/files-key.c
+++ b/nss/nss_files/files-key.c
@@ -21,13 +21,11 @@
 #include <string.h>
 #include <netdb.h>
 #include <rpc/key_prot.h>
+#include <rpc/des_crypt.h>
 #include "nsswitch.h"
 
 #define DATAFILE "/etc/publickey"
 
-/* Prototype for function in xcyrpt.c.  */
-extern int xdecrypt (char *, char *);
-
 
 static enum nss_status
 search (const char *netname, char *result, int *errnop, int secret)