From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 1 Oct 1999 04:48:30 +0000 (+0000)
Subject: Move crypt(3) prototypes from <ac/unistd.h> to <ac/crypt.h> (new) to
X-Git-Tag: UCDATA_2_4~356
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a284b641b7fd4f6913abb464bf7bff2cbfcd2127;p=openldap

Move crypt(3) prototypes from <ac/unistd.h> to <ac/crypt.h> (new) to
avoid clashes with Kth Kerberos.
---

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 98aa570fed..ff4cf6420b 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -30,6 +30,7 @@
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
+#include <ac/crypt.h>
 
 #include <lber.h>
 #include <ldap.h>
diff --git a/include/ac/crypt.h b/include/ac/crypt.h
new file mode 100644
index 0000000000..5c3c1533b3
--- /dev/null
+++ b/include/ac/crypt.h
@@ -0,0 +1,25 @@
+/* Generic crypt.h */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+#ifndef _AC_CRYPT_H
+#define _AC_CRYPT_H
+
+#include <ac/unistd.h>
+
+/* crypt() may be defined in a separate include file */
+#if HAVE_CRYPT_H
+#	include <crypt.h>
+#else
+	extern char *(crypt)();
+#endif
+
+#endif /* _AC_CRYPT_H */
diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 7c2fdfc533..32734777e4 100644
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -21,12 +21,7 @@
 #	include <unistd.h>
 #endif
 
-/* crypt() may be defined in a separate include file */
-#if HAVE_CRYPT_H
-#	include <crypt.h>
-#else
-	extern char *(crypt)();
-#endif
+/* note: callers of crypt(3) should include <ac/crypt.h> */
 
 #ifndef HAVE_GETPASS
 LDAP_F(char*)(getpass) LDAP_P((const char *getpass));
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 74c332745a..6843b84848 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -19,6 +19,7 @@
 
 #include <ac/string.h>
 #include <ac/unistd.h>
+#include <ac/crypt.h>
 
 #include "lutil_md5.h"
 #include "lutil_sha1.h"