From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 26 Aug 2013 22:04:02 +0000 (-0700)
Subject: Use proper #include for xdecrypt declarations.
X-Git-Tag: glibc-2.19~877
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59d112a4c7b6bd3ab220abbb68d8127f316a109c;p=thirdparty%2Fglibc.git

Use proper #include for xdecrypt declarations.
---

diff --git a/ChangeLog b/ChangeLog
index 9cde9010944..2000233eb7c 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 6870e095c62..244e4649788 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 96deac23119..4b2cf24ea6b 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)