From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 19 Nov 1998 01:55:36 +0000 (+0000)
Subject: Import changes from -devel to remove lint.
X-Git-Tag: OPENLDAP_REL_ENG_1_1_ALPHA3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92106da634c909139fe7e76409c150b8da899277;p=thirdparty%2Fopenldap.git

Import changes from -devel to remove lint.
---

diff --git a/clients/fax500/rp500.c b/clients/fax500/rp500.c
index 00d1e4ec1e..5f02cc40e7 100644
--- a/clients/fax500/rp500.c
+++ b/clients/fax500/rp500.c
@@ -14,6 +14,7 @@
 
 #include <stdlib.h>
 
+#include <ac/ctype.h>
 #include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index c8fb201a73..a53f0a3a60 100644
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -22,6 +22,8 @@
 #include <ac/wait.h>
 #include <ac/unistd.h>
 
+#include <sys/stat.h>
+
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index b34790ca92..88fe0b613a 100644
--- a/clients/ud/edit.c
+++ b/clients/ud/edit.c
@@ -114,10 +114,11 @@ load_editor( void )
 	FILE *fp;
 	char *cp, *editor = UD_DEFAULT_EDITOR;
 	static char template[MED_BUF_SIZE];
+#ifndef HAVE_SPAWNLP
 	int pid;
 	int status;
+#endif
 	int rc;
-	void (*handler)();
 	
 #ifdef DEBUG
 	if (debug & D_TRACE)
@@ -186,6 +187,7 @@ load_editor( void )
 	}
 	else if (pid > 0) {
 		/* parent - wait until the child proc is done editing */
+		void (*handler)();
 		handler = SIGNAL(SIGINT, SIG_IGN);
 		(void) wait(&status);
 		(void) SIGNAL(SIGINT, handler);
@@ -204,8 +206,12 @@ print_attrs_and_values( FILE *fp, struct attribute *attrs, short int flag )
 	register int i, j;
 
 	for (i = 0; attrs[i].quipu_name != NULL; i++) {
-		if (!modifiable(attrs[i].quipu_name, flag|ATTR_FLAG_MAY_EDIT))
+		if (!modifiable(attrs[i].quipu_name,
+			(short) (flag|ATTR_FLAG_MAY_EDIT)))
+		{
 			continue;
+		}
+
 		fprintf(fp, "%s\n", attrs[i].quipu_name);
 		if ( attrs[i].number_of_values > MAX_VALUES ) {
 			printf("  The %s attribute has more than %d values.\n",
diff --git a/clients/ud/main.c b/clients/ud/main.c
index e5e418fa53..83823f8a2f 100644
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -157,6 +157,8 @@ main( int argc, char **argv )
 	/* now tackle the user's commands */
 	do_commands();
 	/* NOTREACHED */
+
+	return 0;
 }
 
 void
@@ -521,9 +523,10 @@ initialize_client( void )
 {
 	FILE *fp;				/* for config file */
 	static char buffer[MED_BUF_SIZE];	/* for input */
+#ifdef HAVE_GETPWUID
 	struct passwd *pw;			/* for getting the home dir */
+#endif
 	register char *cp;			/* for fiddling with buffer */
-	char *term;				/* for tty set-up */
 	char *config;				/* config file to use */
 	static char bp[1024];			/* for tty set-up */
 
@@ -535,7 +538,7 @@ initialize_client( void )
 	 *  A per-user config file has precedence over any system-wide
 	 *  config file, if one exists.
 	 */
-#ifdef HAVE_GETPWUID_H
+#ifdef HAVE_GETPWUID
 	if ((pw = getpwuid((uid_t) geteuid())) == (struct passwd *) NULL)
 		config = config_file;
 	else {
@@ -650,6 +653,7 @@ initialize_client( void )
 
 #ifndef NO_TERMCAP
 	{
+	char *term;
 	struct winsize win;			/* for tty set-up */
 
 	if (((term = getenv("TERM")) == NULL) || (tgetent(bp, term) <= 0))
diff --git a/clients/ud/util.c b/clients/ud/util.c
index 4dd0cb223e..41a059d425 100644
--- a/clients/ud/util.c
+++ b/clients/ud/util.c
@@ -23,6 +23,14 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+#ifdef HAVE_CONIO_H
+#include <conio.h>
+#endif
+
 #include <lber.h>
 #include <ldap.h>
 #include <ldapconfig.h>
diff --git a/include/portable.h.nt b/include/portable.h.nt
index 77936fd31d..fd8efac976 100644
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -55,6 +55,9 @@ typedef char * caddr_t;
 /* we have winsock */
 #define HAVE_WINSOCK 1
 
+/* we have <conio.h> */
+#define HAVE_CONIO_H 1
+
 /* we have <io.h> */
 #define HAVE_IO_H 1
 
diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 1cceeb5b40..70e5651c88 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -467,7 +467,7 @@ ber_get_next( Sockbuf *sb, unsigned long *len, BerElement *ber )
 	unsigned long	tag = 0, netlen, toread;
 	unsigned char	lc;
 	long		rc;
-	int			noctets;
+	long		noctets;
 	unsigned int	diff;
 
 #ifdef LDAP_DEBUG