From e4a589d99eb04f5222d6ba8cd755a8968c5c9da1 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 11 Feb 1999 21:16:03 +0000 Subject: [PATCH] Updates for MSVC 5.0. Fix libraries names to be ol{ber,dap,..}32.lib. Fix library/include paths for building "Release". Create getpass() from ud's mygetpass(). --- clients/tools/ldapdelete.dsp | 2 +- clients/tools/ldapmodify.dsp | 6 +- clients/tools/ldapsearch.dsp | 2 +- clients/ud/main.c | 2 + clients/ud/ud.dsp | 2 +- include/ac/unistd.h | 4 + include/portable.h.nt | 311 +++++++++++++++++++------------- libraries/liblber/dtest.dsp | 4 +- libraries/liblber/etest.dsp | 4 +- libraries/liblber/idtest.dsp | 4 +- libraries/liblber/io.c | 2 +- libraries/liblber/liblber.dsp | 28 ++- libraries/libldap/apitest.dsp | 4 +- libraries/libldap/controls.c | 2 + libraries/libldap/ldap-int.h | 1 + libraries/libldap/libldap.dsp | 46 ++++- libraries/libldap/ltest.dsp | 4 +- libraries/libldif/libldif.dsp | 32 +++- libraries/liblutil/getpass.c | 152 ++++++++++++++++ libraries/liblutil/liblutil.dsp | 20 +- 20 files changed, 482 insertions(+), 150 deletions(-) create mode 100644 libraries/liblutil/getpass.c diff --git a/clients/tools/ldapdelete.dsp b/clients/tools/ldapdelete.dsp index 395ec029fe..4b9d91f250 100644 --- a/clients/tools/ldapdelete.dsp +++ b/clients/tools/ldapdelete.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 oldap32.lib olber32.lib olutil32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib olutil32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libraries\Release" !ELSEIF "$(CFG)" == "ldapdelete - Win32 Debug" diff --git a/clients/tools/ldapmodify.dsp b/clients/tools/ldapmodify.dsp index a34cb9ccac..7fc96f7b04 100644 --- a/clients/tools/ldapmodify.dsp +++ b/clients/tools/ldapmodify.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libraries\Release" !ELSEIF "$(CFG)" == "ldapmodify - Win32 Debug" @@ -87,5 +87,9 @@ LINK32=link.exe SOURCE=.\ldapmodify.c # End Source File +# Begin Source File + +SOURCE=..\..\include\portable.h +# End Source File # End Target # End Project diff --git a/clients/tools/ldapsearch.dsp b/clients/tools/ldapsearch.dsp index be396ce5e8..4d9a560bb2 100644 --- a/clients/tools/ldapsearch.dsp +++ b/clients/tools/ldapsearch.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libraries\Release" !ELSEIF "$(CFG)" == "ldapsearch - Win32 Debug" diff --git a/clients/ud/main.c b/clients/ud/main.c index bbd8537e2e..ebbe0b46d1 100644 --- a/clients/ud/main.c +++ b/clients/ud/main.c @@ -576,6 +576,8 @@ initialize_client( void ) config = config_file; } } +#else + config = config_file; #endif /* getpwduid() */ #ifdef DEBUG if (debug & D_INITIALIZE) diff --git a/clients/ud/ud.dsp b/clients/ud/ud.dsp index 2274449996..4e0afa8a1c 100644 --- a/clients/ud/ud.dsp +++ b/clients/ud/ud.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib oldif32.lib olutil32.lib ws2_32.lib hs_regex.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\libraries\Release" !ELSEIF "$(CFG)" == "ud - Win32 Debug" diff --git a/include/ac/unistd.h b/include/ac/unistd.h index f0d9c1ad72..4c2d4ebd73 100644 --- a/include/ac/unistd.h +++ b/include/ac/unistd.h @@ -27,6 +27,10 @@ extern char *crypt(); #endif +#ifndef HAVE_GETPASS +extern char* getpass LDAP_P((const char *getpass)); +#endif + /* getopt() defines may be in separate include file */ #if HAVE_GETOPT_H # include diff --git a/include/portable.h.nt b/include/portable.h.nt index 7ef25bd573..47e4808771 100644 --- a/include/portable.h.nt +++ b/include/portable.h.nt @@ -1,37 +1,23 @@ /* include/portable.h.nt -- manually updated of MS NT (MS VC5) */ /* synced with portable.h.in 1.24 */ /* -Copyright 1998 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. - -This work is derived from the University of Michigan LDAP v3.3 -distribution. Information concerning is available at - http://www.umich.edu/~dirsvcs/ldap/ldap.html. - -This work also contains materials derived from public sources. - ---- - -Portions Copyright (c) 1992-1996 Regents of the University of Michigan. -All rights reserved. - -Redistribution and use in source and binary forms are permitted -provided that this notice is preserved and that due credit is given -to the University of Michigan at Ann Arbor. The name of the University -may not be used to endorse or promote products derived from this -software without specific prior written permission. This software -is provided ``as is'' without express or implied warranty. - -*/ + * 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 _LDAP_PORTABLE_H #define _LDAP_PORTABLE_H +/* end of preamble */ + +/* --------------------------------------------------- */ +/* begin of MSVC5 specific entries */ + /* MSVC5 doesn't define _STDC_ but supports _STDC_ features */ #define __NEED_PROTOTYPES 1 #define HAVE_STDARG 1 @@ -65,6 +51,7 @@ typedef char * caddr_t; /* we have */ #define HAVE_PROCESS_H 1 +/* end of MSVC5 specific entries */ /* --------------------------------------------------- */ /* Define if on AIX 3. @@ -99,9 +86,6 @@ typedef char * caddr_t; /* Define if you have the vprintf function. */ #define HAVE_VPRINTF 1 -/* Define if you have the wait3 system call. */ -/* #undef HAVE_WAIT3 */ - /* Define if on MINIX. */ /* #undef _MINIX */ @@ -139,24 +123,41 @@ typedef char * caddr_t; /* Define to `int' if doesn't define. */ #define uid_t long -/* define this if needed to get reentrant functions */ -/* #undef _REENTRANT */ +/* Define if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ -/* define this if needed to get threadsafe functions */ -/* #undef _THREAD_SAFE */ +/* define this if needed to get reentrant functions */ +#ifndef REENTRANT +/* #undef REENTRANT */ +#endif +#ifndef _REENTRANT +#undef _REENTRANT +#endif /* define this if needed to get threadsafe functions */ +#ifndef THREADSAFE +/* #undef THREADSAFE */ +#endif +#ifndef _THREADSAFE /* #undef _THREADSAFE */ +#endif +#ifndef THREAD_SAFE +/* #undef THREAD_SAFE */ +#endif +#ifndef _THREAD_SAFE +/* #undef _THREAD_SAFE * +#endif /* define this if toupper() requires tolower() */ #define C_UPPER_LOWER +/* define this to the number of arguments ctime_r() expects */ +/* #undef CTIME_R_NARGS */ + /* define this if sys_errlist is not defined in stdio.h or errno.h */ /* #undef DECL_SYS_ERRLIST */ -/* define this if TIOCGWINSZ is defined in sys/ioctl.h */ -/* #undef GWINSZ_IN_SYS_IOCTL */ - /* define if you have berkeley db */ /* #undef HAVE_BERKELEY_DB */ @@ -166,50 +167,17 @@ typedef char * caddr_t; /* define if you have crypt */ /* #undef HAVE_CRYPT */ -/* define if you have DSAP */ -/* #undef HAVE_DSAP */ - /* define if you have GDBM */ /* #undef HAVE_GDBM */ -/* define if you have ISODE */ -/* #undef HAVE_ISODE */ - -/* define if you have Kerberos */ -/* #undef HAVE_KERBEROS */ - -/* define if you have LinuxThreads */ -/* #undef HAVE_LINUX_THREADS */ - -/* define if you have Sun LWP (SunOS style) */ -/* #undef HAVE_LWP */ - -/* define if you have -lncurses */ -/* #undef HAVE_NCURSES */ - /* define if you have NDBM */ /* #undef HAVE_NDBM */ -/* define if you have Mach CThreads */ -/* #undef HAVE_MACH_CTHREADS */ - -/* define if you have POSIX termios */ -/* #undef HAVE_POSIX_TERMIOS */ - -/* define if you have PP */ -/* #undef HAVE_PP */ - -/* define if you have POSIX Threads */ -/* #undef HAVE_PTHREADS */ - -/* define if your POSIX Threads implementatin is circa Final Draft */ -/* #undef HAVE_PTHREADS_FINAL */ - -/* define if your POSIX Threads implementatin is circa Draft 4 */ -/* #undef HAVE_PTHREADS_D4 */ - -/* define if you have ptrdiff_t */ -#define HAVE_PTRDIFF_T +/* define if you have res_search() */ +#ifdef __notdef__ +/* see second res_search define */ +/* #undef HAVE_RES_SEARCH */ +#endif /* define if you have sched_yield() */ #ifdef __notdef__ @@ -220,21 +188,6 @@ typedef char * caddr_t; /* define if you have setproctitle() */ #undef HAVE_SETPROCTITLE -/* define if you have -lwrap */ -/* #undef HAVE_TCPD */ - -/* define if you have -ltermcap */ -/* #undef HAVE_TERMCAP */ - -/* define if you have Solaris LWP Threads */ -/* #undef HAVE_THR */ - -/* define if you have XTPP */ -/* #undef HAVE_XTPP */ - -/* define this if select() implicitly yields in thread environments */ -#define HAVE_YIELDING_SELECT 1 - /* define this for connectionless LDAP support */ /* #undef LDAP_CONNECTIONLESS */ @@ -250,20 +203,23 @@ typedef char * caddr_t; /* define this for LDAP User Interface support */ /* #undef LDAP_LIBUI */ +/* define this to add syslog code */ +/* #undef LDAP_SYSLOG */ + /* define this to use DBBTREE w/ LDBM backend */ /* #undef LDBM_USE_DBBTREE */ /* define this to use DBHASH w/ LDBM backend */ /* #undef LDBM_USE_DBHASH */ -/* define this if you want no termcap support */ -#define NO_TERMCAP 1 +/* define this for ACL Group support */ +/* #undef SLAPD_ACLGROUPS */ -/* define this if you want no thread support */ -#define NO_THREADS 1 +/* define this to use SLAPD Berkeley DB2 backend */ +/* #undef SLAPD_BDB2 */ -/* define this for ACL Group support */ -#define SLAPD_ACLGROUPS +/* define this for ClearText password support */ +/* #undef SLAPD_CLEARTEXT */ /* define this for crypt(3) password support */ /* #undef SLAPD_CRYPT */ @@ -271,26 +227,31 @@ typedef char * caddr_t; /* define this to use SLAPD LDBM backend */ /* #undef SLAPD_LDBM */ -/* define this for MD5 password support */ -#define SLAPD_MD5 1 - /* define this to use SLAPD passwd backend */ /* #undef SLAPD_PASSWD */ +/* define this to use SLAPD perl backend */ +/* #undef SLAPD_PERL */ + /* define this for phonetic support */ /* #undef SLAPD_PHONETIC */ /* define this for Reverse Lookup support */ -#define SLAPD_RLOOKUPS 1 - -/* define this for SHA1 password support */ -#define SLAPD_SHA1 1 +/* #undef SLAPD_RLOOKUPS */ /* define this to use SLAPD shell backend */ /* #undef SLAPD_SHELL */ +/* define this to be empty if your compiler doesn't support volatile */ +/* #undef volatile */ + +/* define this if sig_atomic_t isn't defined in signal.h */ +/* #undef sig_atomic_t */ + /* These are defined in ldap_features.h */ /* + LDAP_API_FEATURE_X_OPENLDAP_REENTRANT + LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE LDAP_API_FEATURE_X_OPENLDAP_V2_DNS LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ @@ -304,18 +265,24 @@ typedef char * caddr_t; /* The number of bytes in a short. */ #define SIZEOF_SHORT 2 -/* Define if you have the alarm function. */ -/* #undef HAVE_ALARM */ - /* Define if you have the bcopy function. */ /* #undef HAVE_BCOPY */ +/* Define if you have the ctime_r function. */ +/* #undef HAVE_CTIME_R */ + /* Define if you have the flock function. */ /* #undef HAVE_FLOCK */ /* Define if you have the getdtablesize function. */ /* #undef HAVE_GETDTABLESIZE */ +/* Define if you have the gethostbyaddr_r function. */ +/* #undef HAVE_GETHOSTBYADDR_R */ + +/* Define if you have the gethostbyname_r function. */ +/* #undef HAVE_GETHOSTBYNAME_R */ + /* Define if you have the gethostname function. */ #define HAVE_GETHOSTNAME 1 @@ -340,26 +307,8 @@ typedef char * caddr_t; /* Define if you have the mkstemp function. */ /* #undef HAVE_MKSTEMP */ -/* Define if you have the pow function. */ -/* #undef HAVE_POW */ - -/* Define if you have the pthread_attr_create function. */ -/* #undef HAVE_PTHREAD_ATTR_CREATE */ - -/* Define if you have the pthread_attr_delete function. */ -/* #undef HAVE_PTHREAD_ATTR_DELETE */ - -/* Define if you have the pthread_attr_destroy function. */ -/* #undef HAVE_PTHREAD_ATTR_DESTROY */ - -/* Define if you have the pthread_attr_init function. */ -/* #undef HAVE_PTHREAD_ATTR_INIT */ - -/* Define if you have the pthread_attr_setdetach_np function. */ -/* #undef HAVE_PTHREAD_ATTR_SETDETACH_NP */ - -/* Define if you have the pthread_attr_setdetachstate function. */ -/* #undef HAVE_PTHREAD_ATTR_SETDETACHSTATE */ +/* Define if you have the pthread_getconcurrency function. */ +/* #undef HAVE_PTHREAD_GETCONCURRENCY */ /* Define if you have the pthread_kill function. */ /* #undef HAVE_PTHREAD_KILL */ @@ -412,12 +361,18 @@ typedef char * caddr_t; /* Define if you have the strsep function. */ /* #undef HAVE_STRSEP */ +/* Define if you have the strspn function. */ +#define HAVE_STRSPN 1 + /* Define if you have the strstr function. */ #define HAVE_STRSTR 1 /* Define if you have the strtok function. */ #define HAVE_STRTOK 1 +/* Define if you have the strtok_r function. */ +/* #undef HAVE_STRTOK_R */ + /* Define if you have the strtol function. */ #define HAVE_STRTOL 1 @@ -430,15 +385,27 @@ typedef char * caddr_t; /* Define if you have the tempnam function. */ /* #undef HAVE_TEMPNAM */ +/* Define if you have the thr_getconcurrency function. */ +/* #undef HAVE_THR_GETCONCURRENCY */ + /* Define if you have the thr_setconcurrency function. */ /* #undef HAVE_THR_SETCONCURRENCY */ +/* Define if you have the thr_yield function. */ +/* #undef HAVE_THR_YIELD */ + /* Define if you have the vsnprintf function. */ /* #undef HAVE_VSNPRINTF */ +/* Define if you have the vsprintf function. */ +/* #undef HAVE_VSPRINTF */ + /* Define if you have the waitpid function. */ #define HAVE_WAITPID 1 +/* Define if you have the header file. */ +/* #undef HAVE_ARPA_NAMESER_H */ + /* Define if you have the header file. */ /* #undef HAVE_CRYPT_H */ @@ -454,6 +421,9 @@ typedef char * caddr_t; /* Define if you have the header file. */ /* #undef HAVE_DIRENT_H */ +/* Define if you have the header file. */ +/* #undef HAVE_DMALLOC_H */ + /* Define if you have the header file. */ #define HAVE_ERRNO_H 1 @@ -517,6 +487,9 @@ typedef char * caddr_t; /* Define if you have the header file. */ /* #undef HAVE_REGEX_H */ +/* Define if you have the header file. */ +/* #undef HAVE_RESOLV_H */ + /* Define if you have the header file. */ /* #undef HAVE_SCHED_H */ @@ -574,9 +547,15 @@ typedef char * caddr_t; /* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define if you have the header file. */ +/* #undef HAVE_SYSEXITS_H */ + /* Define if you have the header file. */ /* #undef HAVE_SYSLOG_H */ +/* Define if you have the header file. */ +/* #undef HAVE_TCPD_H */ + /* Define if you have the header file. */ /* #undef HAVE_TERMCAP_H */ @@ -592,6 +571,12 @@ typedef char * caddr_t; /* Define if you have the V3 library (-lV3). */ /* #undef HAVE_LIBV3 */ +/* Define if you have the bind library (-lbind). */ +/* #undef HAVE_LIBBIND */ + +/* Define if you have the dmalloc library (-ldmalloc). */ +/* #undef HAVE_LIBDMALLOC */ + /* Define if you have the gen library (-lgen). */ /* #undef HAVE_LIBGEN */ @@ -613,6 +598,80 @@ typedef char * caddr_t; /* Define if you have the socket library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ +/* define if you have -lxttp */ +/* #undef HAVE_XTPP */ + +/* define if you have -ldsap */ +/* #undef HAVE_DSAP */ + +/* define if you have -lisode */ +/* #undef HAVE_ISODE */ + +/* define if you have -lpp */ +/* #undef HAVE_PP */ + +/* define if you have Kerberos des_debug */ +/* #undef HAVE_DES_DEBUG */ + +/* define if you have Kerberos */ +/* #undef HAVE_KERBEROS */ + +/* define if pthreads API compatible with final spec */ +/* #undef HAVE_PTHREADS_FINAL */ + +/* define if pthreads API compatible with draft4 spec */ +/* #undef HAVE_PTHREADS_D4 */ + +/* define if you have LinuxThreads */ +/* #undef HAVE_LINUX_THREADS */ + +/* define if you have POSIX Threads */ +/* #undef HAVE_PTHREADS */ + +/* define if you have pthread_detach function */ +/* #undef HAVE_PTHREAD_DETACH */ + +/* define if you have Mach Cthreads */ +/* #undef HAVE_MACH_CTHREADS */ + +/* if you have Solaris LWP (thr) package */ +/* #undef HAVE_THR */ + +/* if you have SunOS LWP package */ +/* #undef HAVE_LWP */ + +/* define if select implicitly yields */ +#define HAVE_YIELDING_SELECT 1 + +/* define if you have (or want) no threads */ +/* #undef NO_THREADS */ + +/* define if you have -lwrap */ +/* #undef HAVE_TCPD */ + +/* define if you have -ltermcap */ +/* #undef HAVE_TERMCAP */ + +/* define if you have -lncurses */ +/* #undef HAVE_NCURSES */ + +/* define if you have no termcap support */ +#define NO_TERMCAP 1 + +/* Define if TIOCGWINSZ requires sys/ioctl.h */ +/* #undef GWINSZ_IN_SYS_IOCTL */ + +/* define if you have POSIX termios */ +/* #undef HAVE_POSIX_TERMIOS */ + +/* Define if system has ptrdiff_t type */ +#define HAVE_PTRDIFF_T 1 + +/* define if cross compiling */ +/* #undef CROSS_COMPILING */ + +/* begin of postamble */ + #ifdef HAVE_STDDEF_H # include #endif diff --git a/libraries/liblber/dtest.dsp b/libraries/liblber/dtest.dsp index e4c1c3ec83..45d042cf89 100644 --- a/libraries/liblber/dtest.dsp +++ b/libraries/liblber/dtest.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 liblber.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 olber32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "dtest - Win32 Debug" @@ -73,7 +73,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 liblber.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" +# ADD LINK32 olber32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" !ENDIF diff --git a/libraries/liblber/etest.dsp b/libraries/liblber/etest.dsp index 574f154bb5..521024a300 100644 --- a/libraries/liblber/etest.dsp +++ b/libraries/liblber/etest.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 liblber.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 olber32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" !ELSEIF "$(CFG)" == "etest - Win32 Debug" @@ -73,7 +73,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 liblber.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" +# ADD LINK32 olber32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" !ENDIF diff --git a/libraries/liblber/idtest.dsp b/libraries/liblber/idtest.dsp index 1d2543be80..2d49b3a765 100644 --- a/libraries/liblber/idtest.dsp +++ b/libraries/liblber/idtest.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 liblber.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 olber32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" !ELSEIF "$(CFG)" == "idtest - Win32 Debug" @@ -73,7 +73,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 liblber.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" +# ADD LINK32 olber32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" !ENDIF diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c index f94aaa7477..fc881b9d44 100644 --- a/libraries/liblber/io.c +++ b/libraries/liblber/io.c @@ -402,7 +402,7 @@ ber_init( struct berval *bv ) } /* copy the data */ - if ( (ber_write ( ber, bv->bv_val, bv->bv_len, 0 )) != bv->bv_len ) { + if ( ( (unsigned int) ber_write ( ber, bv->bv_val, bv->bv_len, 0 )) != bv->bv_len ) { /* write failed, so free and return NULL */ ber_free( ber, 1 ); return( NULL ); diff --git a/libraries/liblber/liblber.dsp b/libraries/liblber/liblber.dsp index 8d1d0bcac1..3932704e0d 100644 --- a/libraries/liblber/liblber.dsp +++ b/libraries/liblber/liblber.dsp @@ -39,7 +39,7 @@ CPP=cl.exe # PROP Intermediate_Dir "Release\liblber" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug\liblber" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -98,5 +98,29 @@ SOURCE=".\lber-int.h" SOURCE=..\..\include\lber.h # End Source File +# Begin Source File + +SOURCE=..\..\include\lber_pvt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_cdefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_features.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_log.h +# End Source File +# Begin Source File + +SOURCE=.\options.c +# End Source File +# Begin Source File + +SOURCE=..\..\include\portable.h +# End Source File # End Target # End Project diff --git a/libraries/libldap/apitest.dsp b/libraries/libldap/apitest.dsp index 2063dd87cb..6cb9698b3f 100644 --- a/libraries/libldap/apitest.dsp +++ b/libraries/libldap/apitest.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 oldap32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" !ELSEIF "$(CFG)" == "apitest - Win32 Debug" @@ -73,7 +73,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 oldap32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" +# ADD LINK32 oldap32.lib olber32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" !ENDIF diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c index 7416242ed2..bac038e304 100644 --- a/libraries/libldap/controls.c +++ b/libraries/libldap/controls.c @@ -8,6 +8,8 @@ #include "portable.h" +#include + #include #include diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index ea28e44fd7..e8c44098fd 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -260,6 +260,7 @@ int ldap_check_cache LDAP_P(( LDAP *ld, unsigned long msgtype, BerElement *reque */ LDAPControl *ldap_control_dup LDAP_P(( LDAPControl *ctrl )); LDAPControl **ldap_controls_dup LDAP_P(( LDAPControl **ctrl )); +int ldap_get_ber_controls LDAP_P(( BerElement *be, LDAPControl ***cp)); /* * in dsparse.c diff --git a/libraries/libldap/libldap.dsp b/libraries/libldap/libldap.dsp index 9b3d47b98d..1739af2de0 100644 --- a/libraries/libldap/libldap.dsp +++ b/libraries/libldap/libldap.dsp @@ -39,7 +39,7 @@ CPP=cl.exe # PROP Intermediate_Dir "Release\libldap" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug\libldap" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -108,6 +108,10 @@ SOURCE=.\compare.c # End Source File # Begin Source File +SOURCE=.\controls.c +# End Source File +# Begin Source File + SOURCE=.\delete.c # End Source File # Begin Source File @@ -168,10 +172,18 @@ SOURCE=.\kbind.c # End Source File # Begin Source File +SOURCE="..\liblber\lber-int.h" +# End Source File +# Begin Source File + SOURCE=..\..\include\lber.h # End Source File # Begin Source File +SOURCE=..\..\include\lber_pvt.h +# End Source File +# Begin Source File + SOURCE=".\ldap-int.h" # End Source File # Begin Source File @@ -180,10 +192,26 @@ SOURCE=..\..\include\ldap.h # End Source File # Begin Source File +SOURCE=..\..\include\ldap_cdefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_features.h +# End Source File +# Begin Source File + SOURCE=..\..\include\ldap_log.h # End Source File # Begin Source File +SOURCE=..\..\include\ldap_pvt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldapconfig.h +# End Source File +# Begin Source File + SOURCE=.\modify.c # End Source File # Begin Source File @@ -204,6 +232,14 @@ SOURCE=".\os-ip.c" # End Source File # Begin Source File +SOURCE=..\..\include\portable.h +# End Source File +# Begin Source File + +SOURCE=.\print.c +# End Source File +# Begin Source File + SOURCE=.\request.c # End Source File # Begin Source File @@ -232,7 +268,7 @@ SOURCE=..\..\include\srchpref.h # End Source File # Begin Source File -SOURCE=.\strdup.c +SOURCE=.\string.c # End Source File # Begin Source File @@ -246,5 +282,9 @@ SOURCE=.\unbind.c SOURCE=.\url.c # End Source File +# Begin Source File + +SOURCE=".\util-int.c" +# End Source File # End Target # End Project diff --git a/libraries/libldap/ltest.dsp b/libraries/libldap/ltest.dsp index ca59106786..60979e8e0f 100644 --- a/libraries/libldap/ltest.dsp +++ b/libraries/libldap/ltest.dsp @@ -48,7 +48,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 libldap.lib liblber.lib liblutil.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 oldap32.lib olber32.lib olutil32.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Release" !ELSEIF "$(CFG)" == "ltest - Win32 Debug" @@ -71,7 +71,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 libldap.lib liblber.lib liblutil.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" +# ADD LINK32 oldap32.lib olber32.lib olutil32.lib hs_regex.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\Debug" !ENDIF diff --git a/libraries/libldif/libldif.dsp b/libraries/libldif/libldif.dsp index 9eb0fe012f..c0d9a02493 100644 --- a/libraries/libldif/libldif.dsp +++ b/libraries/libldif/libldif.dsp @@ -39,13 +39,13 @@ CPP=cl.exe # PROP Intermediate_Dir "Release\libldif" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\Release\oldif32.lib" !ELSEIF "$(CFG)" == "libldif - Win32 Debug" @@ -76,11 +76,39 @@ LIB32=link.exe -lib # Name "libldif - Win32 Debug" # Begin Source File +SOURCE=..\..\include\lber.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\lber_pvt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_cdefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_features.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_log.h +# End Source File +# Begin Source File + SOURCE=..\..\include\ldif.h # End Source File # Begin Source File SOURCE=.\line64.c # End Source File +# Begin Source File + +SOURCE=..\..\include\portable.h +# End Source File +# Begin Source File + +SOURCE=..\libldap\print.c +# End Source File # End Target # End Project diff --git a/libraries/liblutil/getpass.c b/libraries/liblutil/getpass.c new file mode 100644 index 0000000000..c5cc6b0e32 --- /dev/null +++ b/libraries/liblutil/getpass.c @@ -0,0 +1,152 @@ +/* + * Copyright (c) 1992, 1993 Regents of the University of Michigan. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of Michigan at Ann Arbor. The name of the University + * may not be used to endorse or promote products derived from this + * software without specific prior written permission. This software + * is provided ``as is'' without express or implied warranty. + */ + +#include "portable.h" + +#ifndef HAVE_GETPASS + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_FCNTL_H +#include +#endif + +#ifdef HAVE_CONIO_H +#include +#endif + +#include +#include +#include + +char * +getpass( const char *prompt ) +{ +#if !defined(HAVE_POSIX_TERMIOS) && !defined(HAVE_SGTTY_H) + static char buf[256]; + int i, c; + +#ifdef DEBUG + if (debug & D_TRACE) + printf("->getpass(%s)\n", prompt); +#endif + printf("%s", prompt); + i = 0; + while ( (c = getch()) != EOF && c != '\n' && c != '\r' ) + buf[i++] = c; + if ( c == EOF ) + return( NULL ); + buf[i] = '\0'; + return (buf); +#else + int no_pass = 0; + char i, j, k; + TERMIO_TYPE ttyb; + TERMFLAG_TYPE flags; + static char pbuf[513]; + register char *p; + register int c; + FILE *fi; + RETSIGTYPE (*sig)( int sig ); + +#ifdef DEBUG + if (debug & D_TRACE) + printf("->getpass(%s)\n", prompt); +#endif + /* + * Stolen from the getpass() routine. Can't use the plain + * getpass() for two reasons. One is that LDAP passwords + * can be really, really long - much longer than 8 chars. + * The second is that we like to make this client available + * out of inetd via a Merit asynch port, and we need to be + * able to do telnet control codes to turn on and off line + * blanking. + */ + if ((fi = fdopen(open("/dev/tty", 2), "r")) == NULL) + fi = stdin; + else + setbuf(fi, (char *)NULL); + sig = SIGNAL (SIGINT, SIG_IGN); + if (fi != stdin) { + if (GETATTR(fileno(fi), &ttyb) < 0) + perror("GETATTR"); + } + flags = GETFLAGS( ttyb ); + SETFLAGS( ttyb, flags & ~ECHO ); + if (fi != stdin) { + if (SETATTR(fileno(fi), &ttyb) < 0) + perror("SETATTR"); + } + + /* blank the line if through Merit */ + if (fi == stdin) { + printf("%c%c%c", 255, 251, 1); + fflush(stdout); + (void) scanf("%c%c%c", &i, &j, &k); + fflush(stdin); + } + + /* fetch the password */ + fprintf(stdout, "%s", prompt); + fflush(stdout); + for (p=pbuf; (c = getc(fi))!='\n' && c!=EOF;) { + if (c == '\r') + break; + if (p < &pbuf[512]) + *p++ = c; + } + if (c == EOF) + no_pass = 1; + else { + *p = '\0'; + if (*(p - 1) == '\r') + *(p - 1) = '\0'; + } + + /* unblank the line if through Merit */ + if (fi == stdin) { + printf("%c%c%c", 255, 252, 1); + fflush(stdout); + (void) scanf("%c%c%c", &i, &j, &k); + fflush(stdin); + printf("\n"); fflush(stdout); + } + fprintf(stdout, "\n"); + fflush(stdout); + + /* tidy up */ + SETFLAGS( ttyb, flags ); + if (fi != stdin) { + if (SETATTR(fileno(fi), &ttyb) < 0) + perror("SETATTR"); + } + (void) SIGNAL (SIGINT, sig); + if (fi != stdin) + (void) fclose(fi); + else + i = getchar(); + if (no_pass) + return(NULL); + return(pbuf); +#endif /* DOS */ +} + +#endif /* !HAVE_GETPASS */ \ No newline at end of file diff --git a/libraries/liblutil/liblutil.dsp b/libraries/liblutil/liblutil.dsp index 7188ca00dc..e3f1ff6fc6 100644 --- a/libraries/liblutil/liblutil.dsp +++ b/libraries/liblutil/liblutil.dsp @@ -39,13 +39,13 @@ CPP=cl.exe # PROP Intermediate_Dir "Release\liblutil" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\Release\olutil32.lib" !ELSEIF "$(CFG)" == "liblutil - Win32 Debug" @@ -88,6 +88,18 @@ SOURCE=.\getopt.c # End Source File # Begin Source File +SOURCE=.\getpass.c +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_cdefs.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\ldap_features.h +# End Source File +# Begin Source File + SOURCE=..\..\include\lutil.h # End Source File # Begin Source File @@ -104,6 +116,10 @@ SOURCE=.\md5.c # End Source File # Begin Source File +SOURCE=..\..\include\portable.h +# End Source File +# Begin Source File + SOURCE=.\sha1.c # End Source File # End Target -- 2.39.5