mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 00:29:35 -05:00
ITS#2992 Windows fixes from Alexey Melnikov
This commit is contained in:
Howard Chu
parent
8aedfad3bb
commit
c558bd49bc
9 changed files with 44 additions and 110 deletions
105
build/main.dsw
105
build/main.dsw
|
|
@ -251,9 +251,6 @@ Package=<4>
|
|||
Begin Project Dependency
|
||||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
|
@ -294,9 +291,6 @@ Package=<4>
|
|||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
|
@ -360,9 +354,6 @@ Package=<4>
|
|||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
|
@ -390,21 +381,6 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "libavl"=..\libraries\libavl\libavl.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name setup
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "liblber"=..\libraries\liblber\liblber.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
|
@ -450,36 +426,6 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "libldbm"=..\libraries\libldbm\libldbm.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name setup
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "libldif"=..\libraries\libldif\libldif.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name setup
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "liblunicode"=..\libraries\liblunicode\liblunicode.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
|
@ -609,21 +555,12 @@ Package=<4>
|
|||
Project_Dep_Name backldbm
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libavl
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldap_r
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldbm
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
|
|
@ -638,6 +575,9 @@ Package=<4>
|
|||
Begin Project Dependency
|
||||
Project_Dep_Name backmon
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name backldbm
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
|
@ -650,9 +590,6 @@ Package=<5>
|
|||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libavl
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
|
|
@ -660,12 +597,6 @@ Package=<4>
|
|||
Project_Dep_Name libldap_r
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldbm
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
|
|
@ -702,12 +633,6 @@ Package=<4>
|
|||
Project_Dep_Name libldap_r
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libavl
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
|
|
@ -717,9 +642,6 @@ Package=<4>
|
|||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldbm
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libslapd
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
|
|
@ -731,6 +653,9 @@ Package=<4>
|
|||
Begin Project Dependency
|
||||
Project_Dep_Name backmon
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name backldbm
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
|
@ -747,21 +672,12 @@ Package=<4>
|
|||
Project_Dep_Name backldbm
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libavl
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldap_r
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldbm
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libldif
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
|
|
@ -776,11 +692,14 @@ Package=<4>
|
|||
Begin Project Dependency
|
||||
Project_Dep_Name backmon
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name badldbm
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "testavl"=..\libraries\libavl\testavl.dsp - Package Owner=<4>
|
||||
Project: "testavl"=..\libraries\liblutil\testavl.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -789,10 +708,10 @@ Package=<5>
|
|||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name libavl
|
||||
Project_Dep_Name liblber
|
||||
End Project Dependency
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name liblber
|
||||
Project_Dep_Name liblutil
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
|
|
|
|||
|
|
@ -1058,5 +1058,6 @@ typedef signed int ssize_t;
|
|||
#include "ldap_features.h"
|
||||
|
||||
#include "ac/assert.h"
|
||||
#include "ac/localize.h"
|
||||
|
||||
#endif /* _LDAP_PORTABLE_H */
|
||||
|
|
|
|||
|
|
@ -146,8 +146,6 @@ void lutil_log_int(
|
|||
time_t now;
|
||||
struct tm *today;
|
||||
#endif
|
||||
size_t i;
|
||||
char * tmp;
|
||||
|
||||
#ifdef LDAP_SYSLOG
|
||||
/* we're configured to use syslog */
|
||||
|
|
|
|||
|
|
@ -632,6 +632,7 @@ ldap_int_sasl_bind(
|
|||
LDAP_FREE( authid.bv_val );
|
||||
}
|
||||
|
||||
#if !defined(_WIN32)
|
||||
/* Check for local */
|
||||
if ( ldap_pvt_url_scheme2proto( ld->ld_defconn->lconn_server->lud_scheme ) == LDAP_PROTO_IPC ) {
|
||||
char authid[sizeof("uidNumber=4294967295+gidNumber=4294967295,"
|
||||
|
|
@ -641,6 +642,7 @@ ldap_int_sasl_bind(
|
|||
(int) geteuid(), (int) getegid() );
|
||||
(void) ldap_int_sasl_external( ld, ld->ld_defconn, authid, LDAP_PVT_SASL_LOCAL_SSF );
|
||||
}
|
||||
#endif
|
||||
|
||||
/* (re)set security properties */
|
||||
sasl_setprop( ctx, SASL_SEC_PROPS,
|
||||
|
|
|
|||
|
|
@ -523,7 +523,6 @@ ldap_host_connected_to( Sockbuf *sb, const char *host )
|
|||
struct sockaddr sabuf;
|
||||
#endif
|
||||
struct sockaddr *sa = (struct sockaddr *) &sabuf;
|
||||
int rc;
|
||||
ber_socket_t sd;
|
||||
|
||||
(void)memset( (char *)sa, '\0', sizeof sabuf );
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ ldap_build_search_req(
|
|||
ber_int_t *idp)
|
||||
{
|
||||
BerElement *ber;
|
||||
int err, id;
|
||||
int err;
|
||||
|
||||
/*
|
||||
* Create the search request. It looks like this:
|
||||
|
|
|
|||
|
|
@ -293,5 +293,25 @@ SOURCE=.\utils.c
|
|||
|
||||
SOURCE=.\uuid.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\avl.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\avl.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ldif.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\fetch.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\ldif.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
|
|
|||
|
|
@ -185,7 +185,6 @@ int lutil_passwd_add(
|
|||
|
||||
void lutil_passwd_init()
|
||||
{
|
||||
struct pw_slist *ptr;
|
||||
struct pw_scheme *s;
|
||||
|
||||
for( s=(struct pw_scheme *)pw_schemes_default; s->name.bv_val; s++) {
|
||||
|
|
|
|||
|
|
@ -140,10 +140,6 @@ SOURCE=.\attr.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\attribute.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=".\back-ldbm.h"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -196,10 +192,6 @@ SOURCE=.\filterindex.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\group.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\id2children.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -240,10 +232,6 @@ SOURCE=.\operational.c
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\passwd.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=".\proto-back-ldbm.h"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -258,5 +246,13 @@ SOURCE=.\search.c
|
|||
|
||||
SOURCE=.\tools.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ldbm.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ldbm.h
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
|
|
|||
Loading…
Reference in a new issue