diff options
Diffstat (limited to 'lib/ldaputil')
| -rw-r--r-- | lib/ldaputil/examples/Certmap.mak | 26 | ||||
| -rw-r--r-- | lib/ldaputil/examples/README | 6 | ||||
| -rw-r--r-- | lib/ldaputil/utest/auth.cpp | 4 | ||||
| -rwxr-xr-x | lib/ldaputil/utest/authtest | 2 | ||||
| -rw-r--r-- | lib/ldaputil/utest/certmap.conf | 2 | ||||
| -rw-r--r-- | lib/ldaputil/utest/stubs.cpp | 2 | ||||
| -rw-r--r-- | lib/ldaputil/utest/test.ref | 14 |
7 files changed, 28 insertions, 28 deletions
diff --git a/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak index a8e2d0ee..d965d152 100644 --- a/lib/ldaputil/examples/Certmap.mak +++ b/lib/ldaputil/examples/Certmap.mak @@ -72,8 +72,8 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\netscape\suitespot\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\netscape\suitespot\include" /D "WIN32"\ +# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c +CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32"\ /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ CPP_SBRS=.\. @@ -99,7 +99,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ LINK32_OBJS= \ "$(INTDIR)\init.obj" \ "$(INTDIR)\plugin.obj" \ - "C:\Netscape\SuiteSpot\lib\nsldap32v10.lib" + "C:\Fedora\servers\lib\nsldap32v10.lib" "$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -138,8 +138,8 @@ CLEAN : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\netscape\suitespot\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\netscape\suitespot\include" /D\ +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c +CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D\ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX\ /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c CPP_OBJS=.\Debug/ @@ -166,7 +166,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ LINK32_OBJS= \ "$(INTDIR)\init.obj" \ "$(INTDIR)\plugin.obj" \ - "C:\Netscape\SuiteSpot\lib\nsldap32v10.lib" + "C:\Fedora\servers\lib\nsldap32v10.lib" "$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -211,9 +211,9 @@ LINK32_OBJS= \ SOURCE=.\plugin.c DEP_CPP_PLUGI=\ ".\plugin.h"\ - "c:\netscape\suitespot\include\certmap.h"\ - "c:\netscape\suitespot\include\lber.h"\ - "c:\netscape\suitespot\include\ldap.h"\ + "c:\Fedora\servers\include\certmap.h"\ + "c:\Fedora\servers\include\lber.h"\ + "c:\Fedora\servers\include\ldap.h"\ {$(INCLUDE)}"\sys\types.h"\ @@ -227,9 +227,9 @@ DEP_CPP_PLUGI=\ SOURCE=.\init.c DEP_CPP_INIT_=\ ".\plugin.h"\ - "c:\netscape\suitespot\include\certmap.h"\ - "c:\netscape\suitespot\include\lber.h"\ - "c:\netscape\suitespot\include\ldap.h"\ + "c:\Fedora\servers\include\certmap.h"\ + "c:\Fedora\servers\include\lber.h"\ + "c:\Fedora\servers\include\ldap.h"\ {$(INCLUDE)}"\sys\types.h"\ @@ -240,7 +240,7 @@ DEP_CPP_INIT_=\ ################################################################################ # Begin Source File -SOURCE=C:\Netscape\SuiteSpot\lib\nsldap32v10.lib +SOURCE=C:\Fedora\servers\lib\nsldap32v10.lib !IF "$(CFG)" == "Certmap - Win32 Release" diff --git a/lib/ldaputil/examples/README b/lib/ldaputil/examples/README index 51bc59e8..0cf56b0f 100644 --- a/lib/ldaputil/examples/README +++ b/lib/ldaputil/examples/README @@ -7,7 +7,7 @@ This directory contains an example program to demonstrate writing plugins using the "Certificate to LDAP Mapping" API. -Please read the "Managing Netscape Servers" manual to find out +Please read the "Managing Servers" manual to find out about how certificate to ldap mapping can be configured using the <ServerRoot>/userdb/certmap.conf file. Also refer to the "Certificate to LDAP Mapping API" documentation to find out @@ -66,8 +66,8 @@ subject DN and the issuer DN from the certificate. Build Procedure --------------- On UNIX: Edit the Makefile, and set the variables ARCH & SROOT -according to the comments in the Makefile. Download LDAP SDK -from the Netscape's DevEdge site and make the ldap include +according to the comments in the Makefile. Download LDAP C SDK +from the mozilla.org site and make the ldap include files available in <SROOT>/include. Copy the ../include/certmap.h file to the <SROOT>/include directory. Use 'gmake' to build the plugin. A shared library plugin.so diff --git a/lib/ldaputil/utest/auth.cpp b/lib/ldaputil/utest/auth.cpp index cfdd4a53..c273e803 100644 --- a/lib/ldaputil/utest/auth.cpp +++ b/lib/ldaputil/utest/auth.cpp @@ -21,7 +21,7 @@ static const char* dllname = "plugin.so"; -char *global_issuer_dn = "o=Netscape Communications, c=US"; +char *global_issuer_dn = "o=Fedora Project, c=US"; #define NSPR_INIT(Program) (PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 8)) @@ -62,7 +62,7 @@ static int ldapu_certinfo_delete_test (const char *fname, const char *old_fname) } /* rv = ldapu_certinfo_delete("o=Ace Industry, c=US"); */ - rv = ldapu_certinfo_delete("o=Netscape Communications, c=US"); + rv = ldapu_certinfo_delete("o=Fedora Project, c=US"); if (rv != LDAPU_SUCCESS) { fprintf(stderr, "ldapu_certinfo_delete failed. Reason: %s\n", diff --git a/lib/ldaputil/utest/authtest b/lib/ldaputil/utest/authtest index 026fa9d1..f08db599 100755 --- a/lib/ldaputil/utest/authtest +++ b/lib/ldaputil/utest/authtest @@ -87,7 +87,7 @@ must_succeed ./auth 9 "o=Ace Industry, c=US" "cn=Kirsten Vaughan, ou=Human Resou #must_fail ./auth 9 "default" "cn=Kirsten Vaughan, o=Ace Industry, c=US" # test for encode/decode bindpw -must_succeed ./auth 10 "cn=Foo Bar, o=Netscape Communication, c=US" "foobar" +must_succeed ./auth 10 "cn=Foo Bar, o=Fedora Project, c=US" "foobar" # test for reading dbnames from dbswitch.conf file must_succeed ./auth 11 dblist.conf ignore diff --git a/lib/ldaputil/utest/certmap.conf b/lib/ldaputil/utest/certmap.conf index 7d2dd575..7be4532f 100644 --- a/lib/ldaputil/utest/certmap.conf +++ b/lib/ldaputil/utest/certmap.conf @@ -21,7 +21,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Netscape Communications, c=US +certmap default1 o=Fedora Project, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c diff --git a/lib/ldaputil/utest/stubs.cpp b/lib/ldaputil/utest/stubs.cpp index 4dfce34a..b3ae6e09 100644 --- a/lib/ldaputil/utest/stubs.cpp +++ b/lib/ldaputil/utest/stubs.cpp @@ -26,7 +26,7 @@ NSAPI_PUBLIC int ldapu_get_cert_subject_dn (void *cert_in, char **subjectDN) NSAPI_PUBLIC int ldapu_get_cert_issuer_dn (void *cert, char **issuerDN) { /* TEMPORARY -- not implemented yet*/ - *issuerDN = strdup("o=Netscape Communications, c=US"); + *issuerDN = strdup("o=Fedora Project, c=US"); return *issuerDN ? LDAPU_SUCCESS : LDAPU_FAILED; } diff --git a/lib/ldaputil/utest/test.ref b/lib/ldaputil/utest/test.ref index 88d4effd..b1ad9ccf 100644 --- a/lib/ldaputil/utest/test.ref +++ b/lib/ldaputil/utest/test.ref @@ -254,9 +254,9 @@ plugin_verify_fn called. Matched entry to cert: "cn=Kirsten Vaughan, ou=Human Resources, o=Ace Industry, c=US" Authentication succeeded. -Start of test: ./auth 10 "cn=Foo Bar, o=Netscape Communication, c=US" "foobar" +Start of test: ./auth 10 "cn=Foo Bar, o=Fedora Project, c=US" "foobar" Config file written: config_out.conf -binddn from config file: "cn=Foo Bar, o=Netscape Communication, c=US" +binddn from config file: "cn=Foo Bar, o=Fedora Project, c=US" bindpw from config file: "foobar" Config file test succeeded Authentication succeeded. @@ -291,7 +291,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Netscape Communications, c=US +certmap default1 o=Fedora Project, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -317,7 +317,7 @@ default2:verifycert on certmap default default -certmap default1 o=Netscape Communications, c=US +certmap default1 o=Fedora Project, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -350,7 +350,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Netscape Communications, c=US +certmap default1 o=Fedora Project, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -403,7 +403,7 @@ certmap default default #default:FilterComps cn -certmap default1 o=Netscape Communications, c=US +certmap default1 o=Fedora Project, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c @@ -429,7 +429,7 @@ default2:verifycert on certmap default default -certmap default1 o=Netscape Communications, c=US +certmap default1 o=Fedora Project, c=US default1:library ./plugin.so default1:InitFn plugin_init_fn default1:DNComps ou o c |